diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2011-01-01 14:39:12 +0100 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2011-01-01 14:39:12 +0100 |
| commit | 0721bb1d4c247b3d063a589644f4b88c2585fedd (patch) | |
| tree | 9697ebf2eef7c30dbd4c8f83270c22eea3be656b | |
| parent | 7445c12667766d4a8ea43536325a25a44d5acd18 (diff) | |
| download | weechat-0721bb1d4c247b3d063a589644f4b88c2585fedd.zip | |
Add new command /color
35 files changed, 1754 insertions, 482 deletions
@@ -1,16 +1,16 @@ WeeChat ChangeLog ================= Sébastien Helleu <flashcode@flashtux.org> -v0.3.4-rc2, 2010-12-27 +v0.3.4-rc2, 2011-01-01 Version 0.3.4 (under dev!) -------------------------- +* core: add 256 colors support, new command /color, new section "palette" in + weechat.conf (task #6834) * core: add info "weechat_upgrading", signal "upgrade_ended", display duration of upgrade -* core: add 256 colors support, new section "palette" in weechat.conf - (task #6834) * core: replace the 10 nick color options and number of nick colors by a single option "weechat.color.chat_nick_colors" (comma separated list of colors) * core: add support of python 2.7 in cmake and configure (debian #606989) diff --git a/doc/de/autogen/plugin_api/completions.txt b/doc/de/autogen/plugin_api/completions.txt index 6e7213c7f..76eb3ce8b 100644 --- a/doc/de/autogen/plugin_api/completions.txt +++ b/doc/de/autogen/plugin_api/completions.txt @@ -70,6 +70,8 @@ | weechat | buffers_plugins_names | Liste der Buffer (inkl. der Erweiterungen) +| weechat | color_pairs | color pairs + | weechat | commands | Befehle (WeeChat und Erweiterungen) | weechat | config_files | Konfigurationsdateien diff --git a/doc/de/autogen/plugin_api/infos.txt b/doc/de/autogen/plugin_api/infos.txt index f3ad18d2e..4ca8a2015 100644 --- a/doc/de/autogen/plugin_api/infos.txt +++ b/doc/de/autogen/plugin_api/infos.txt @@ -52,6 +52,6 @@ | weechat | weechat_site_download | Download-Seite von WeeChat | - -| weechat | weechat_upgrading | 1 if WeeChat is upgrading (command `/upgrade`) | - +| weechat | weechat_upgrading | 1 falls WeeChat ein Upgrade durchführt (Befehl `/upgrade`) | - |======================================== diff --git a/doc/de/autogen/user/irc_commands.txt b/doc/de/autogen/user/irc_commands.txt index 85644920f..c0fa55d68 100644 --- a/doc/de/autogen/user/irc_commands.txt +++ b/doc/de/autogen/user/irc_commands.txt @@ -201,13 +201,13 @@ ........................................ einen Channel betreten - server: send to this server (internal name) - channel: channel name to join - key: key to join the channel (channels with a key must be the first in list) + server: sendet an diesen Server (interner Name) + channel: Name des Channels der betreten werden soll + key: Zugriffsschlüssel für einen Channel (Channels die einen Zugriffsschlüssel benötigen müssen zuerst aufgeführt werden) - Examples: + Beispiele: /join #weechat - /join #protectedchan,#weechat key + /join #geschützterChannel,#weechat Zugriffsschlüssel /join -server freenode #weechat ........................................ diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt index 307cab574..c3c4a704d 100644 --- a/doc/de/autogen/user/weechat_commands.txt +++ b/doc/de/autogen/user/weechat_commands.txt @@ -99,6 +99,30 @@ /buffer +1 ........................................ +• *`/color`* `[add pair [alias] [fg,bg] [r/g/b]] | [del pair] | switch`:: + +........................................ + define custom colors and display palette of colors + + add: add a color pair + del: delete a color pair + switch: switch WeeChat/terminal colors + pair: pair number (>= 1) + alias: alias name for color (for example: "orange") + fg,bg: foreground and background pair number (-1 for default terminal foreground or background) + r/g/b: red/green/blue values (0-1000), terminal must support it + + Without argument, this command displays colors in a new buffer. + + Examples: + add color 214 with alias "orange": + /color add 214 orange + add color 250 with orange on blue: + /color add 250 214,4 orange_blue + delete color 214: + /color del 214 +........................................ + • *`/command`* `Erweiterungs-Befehl`:: ........................................ diff --git a/doc/de/weechat_faq.de.txt b/doc/de/weechat_faq.de.txt index a354dfd3b..46a652a55 100644 --- a/doc/de/weechat_faq.de.txt +++ b/doc/de/weechat_faq.de.txt @@ -535,25 +535,24 @@ Es gibt drei Möglichkeiten: (Um emails an die "support" Mailing-Liste zu schicken, kannst Du diese abonnieren) -// TRANSLATION MISSING [[gdb_error_threads]] -When I run WeeChat under gdb, there is an error about threads, what can I do? -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Wenn man WeeChat in gdb startet kann ein Thread-Fehler auftreten. Was beudeutet das? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -When you run WeeChat under gdb, you may have this error: +Falls man WeeChat in gdb ausführt kann folgende Fehlermeldung erscheinen: ---------------------------------------- -gdb /path/to/weechat-curses +gdb /Pfad/zu/weechat-curses (gdb) run [Thread debugging using libthread_db enabled] Cannot find new threads: generic error ---------------------------------------- -To fix that, you can run gdb with this command (replace path to libpthread and -WeeChat with paths on your system): +Um diesen Fehler zu beheben sollte man gdb wie folgt aufrufen (der Pfad zu +libpthread und WeeChat muss natürlich an das eigene System angepasst werden): ---------------------------------------- -LD_PRELOAD=/lib/libpthread.so.0 gdb /path/to/weechat-curses +LD_PRELOAD=/lib/libpthread.so.0 gdb /Pfad/zu/weechat-curses (gdb) run ---------------------------------------- diff --git a/doc/en/autogen/plugin_api/completions.txt b/doc/en/autogen/plugin_api/completions.txt index 9987a8953..f3ddecb50 100644 --- a/doc/en/autogen/plugin_api/completions.txt +++ b/doc/en/autogen/plugin_api/completions.txt @@ -70,6 +70,8 @@ | weechat | buffers_plugins_names | names of buffers (including plugins names) +| weechat | color_pairs | color pairs + | weechat | commands | commands (weechat and plugins) | weechat | config_files | configuration files diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt index b78c2b04a..4a9fcd7fe 100644 --- a/doc/en/autogen/user/weechat_commands.txt +++ b/doc/en/autogen/user/weechat_commands.txt @@ -99,6 +99,30 @@ /buffer +1 ........................................ +• *`/color`* `[add pair [alias] [fg,bg] [r/g/b]] | [del pair] | switch`:: + +........................................ + define custom colors and display palette of colors + + add: add a color pair + del: delete a color pair + switch: switch WeeChat/terminal colors + pair: pair number (>= 1) + alias: alias name for color (for example: "orange") + fg,bg: foreground and background pair number (-1 for default terminal foreground or background) + r/g/b: red/green/blue values (0-1000), terminal must support it + + Without argument, this command displays colors in a new buffer. + + Examples: + add color 214 with alias "orange": + /color add 214 orange + add color 250 with orange on blue: + /color add 250 214,4 orange_blue + delete color 214: + /color del 214 +........................................ + • *`/command`* `plugin command`:: ........................................ diff --git a/doc/fr/autogen/plugin_api/completions.txt b/doc/fr/autogen/plugin_api/completions.txt index 5f45c0b14..033161995 100644 --- a/doc/fr/autogen/plugin_api/completions.txt +++ b/doc/fr/autogen/plugin_api/completions.txt @@ -70,6 +70,8 @@ | weechat | buffers_plugins_names | noms des tampons (incluant les noms d'extensions) +| weechat | color_pairs | paires de couleur + | weechat | commands | commandes (weechat et extensions) | weechat | config_files | fichiers de configuration diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt index 9816e8c89..66d748514 100644 --- a/doc/fr/autogen/user/weechat_commands.txt +++ b/doc/fr/autogen/user/weechat_commands.txt @@ -99,6 +99,30 @@ /buffer +1 ........................................ +• *`/color`* `[add paire [alias] [fg,bg] [r/g/b]] | [del paire] | switch`:: + +........................................ + définir des couleurs personnalisées et afficher la palette des couleurs + + add: ajouter une paire de couleur + del: supprimer une paire de couleur + switch: basculer entre les couleurs WeeChat et du terminal + paire: numéro de paire (>= 1) + alias: nom d'alias pour la couleur (par exemple: "orange") + fg,bg: numéro de paire pour le texte et le fond (-1 pour la couleur par défaut du terminal pour le texte ou le fond) + r/g/b: valeurs rouge/vert/bleu pour redéfinir la couleur (0-1000), seulement si le terminal le supporte + + Sans paramètre, cette commande affiche les couleurs dans un nouveau tampon. + + Exemples: + ajouter la couleur 214 avec l'alias "orange": + /color add 214 orange + ajouter la couleur 250 avec orange sur bleu: + /color add 250 214,4 orange_bleu + supprimer la couleur 214: + /color del 214 +........................................ + • *`/command`* `extension commande`:: ........................................ diff --git a/doc/it/autogen/plugin_api/completions.txt b/doc/it/autogen/plugin_api/completions.txt index 7b56db365..e68d92817 100644 --- a/doc/it/autogen/plugin_api/completions.txt +++ b/doc/it/autogen/plugin_api/completions.txt @@ -70,6 +70,8 @@ | weechat | buffers_plugins_names | nomi dei buffer (inclusi i nomi plugin) +| weechat | color_pairs | color pairs + | weechat | commands | comandi (weechat e plugin) | weechat | config_files | file di configurazione diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt index cec386a71..27965c2e1 100644 --- a/doc/it/autogen/user/weechat_commands.txt +++ b/doc/it/autogen/user/weechat_commands.txt @@ -99,6 +99,30 @@ /buffer +1 ........................................ +• *`/color`* `[add pair [alias] [fg,bg] [r/g/b]] | [del pair] | switch`:: + +........................................ + define custom colors and display palette of colors + + add: add a color pair + del: delete a color pair + switch: switch WeeChat/terminal colors + pair: pair number (>= 1) + alias: alias name for color (for example: "orange") + fg,bg: foreground and background pair number (-1 for default terminal foreground or background) + r/g/b: red/green/blue values (0-1000), terminal must support it + + Without argument, this command displays colors in a new buffer. + + Examples: + add color 214 with alias "orange": + /color add 214 orange + add color 250 with orange on blue: + /color add 250 214,4 orange_blue + delete color 214: + /color del 214 +........................................ + • *`/command`* `plugin comando`:: ........................................ @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.4-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-12-27 11:05+0100\n" +"POT-Creation-Date: 2011-01-01 11:27+0100\n" "PO-Revision-Date: 2010-11-06 11:55+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -146,10 +146,6 @@ msgid "No bar item defined" msgstr "Žádné položky pole nejsou definovány" #, c-format -msgid "%sError: missing arguments for \"%s\" command" -msgstr "%sChyba: chybí argumenty pro příkaz \"%s\"" - -#, c-format msgid "%sNot enough memory" msgstr "%sNedostatek paměti" @@ -223,6 +219,14 @@ msgid "No local variable defined for buffer \"%s\"" msgstr "Není definovaná žádná lokální proměnná pro buffer \"%s\"" #, c-format +msgid "%sInvalid pair number \"%s\" (must be between %d and %d)" +msgstr "" + +#, c-format +msgid "%sColor \"%s\" is not defined in palette" +msgstr "" + +#, c-format msgid "%sPlugin \"%s\" not found" msgstr "%sPlugin \"%s\" nenalezen" @@ -266,6 +270,10 @@ msgid "Filter \"%s\" disabled" msgstr "Filtr \"%s\" zakázán" #, c-format +msgid "%sError: missing arguments for \"%s\" command" +msgstr "%sChyba: chybí argumenty pro příkaz \"%s\"" + +#, c-format msgid "%sError: filter \"%s\" already exists" msgstr "%sChyba: filtr \"%s\" již existuje" @@ -681,6 +689,10 @@ msgstr "%sChyba: volba nastavení \"%s\" nenalezena" msgid "Option changed: " msgstr "Volba změněna: " +#, fuzzy +msgid "Option created: " +msgstr "Volba změněna: " + msgid "Option changed" msgstr "Volba změněna" @@ -995,6 +1007,32 @@ msgstr "" " skočit na další buffer:\n" " /buffer +1" +msgid "define custom colors and display palette of colors" +msgstr "" + +msgid "[add pair [alias] [fg,bg]] | [del pair] | switch" +msgstr "" + +msgid "" +" add: add a color pair\n" +" del: delete a color pair\n" +"switch: switch WeeChat/terminal colors\n" +" pair: pair number (>= 1)\n" +" alias: alias name for color (for example: \"orange\")\n" +" fg,bg: foreground and background pair number (-1 for default terminal " +"foreground or background)\n" +"\n" +"Without argument, this command displays colors in a new buffer.\n" +"\n" +"Examples:\n" +" add color 214 with alias \"orange\":\n" +" /color add 214 orange\n" +" add color 250 with orange on blue:\n" +" /color add 250 214,4 orange_blue\n" +" delete color 214:\n" +" /color del 214" +msgstr "" + msgid "launch explicit WeeChat or plugin command" msgstr "pustit uvedený WeeChat nebo plugin příkaz" @@ -1692,6 +1730,10 @@ msgstr "vlastnosti, které mohou být nastaveny bufferu" msgid "properties that can be read on a buffer" msgstr "vlastnosti, které mohou být čteny o bufferu" +#, fuzzy +msgid "color pairs" +msgstr "barva" + msgid "configuration files" msgstr "konfigurační soubory" @@ -1763,10 +1805,9 @@ msgid "debug level for plugin (\"core\" for WeeChat core)" msgstr "úroveň ladění pro plugin (\"core\" pro jádro WeeChat)" msgid "" -"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is " -"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b " -"is redefinition of color (terminal must support it) (everything is optional " -"in this format and order is not important)" +"custom color in palette, format is: \"alias;fg,bg\" where alias is color " +"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything " +"is optional in this format and order is not important)" msgstr "" #, fuzzy, c-format @@ -2526,6 +2567,35 @@ msgstr "" msgid "Default colors:" msgstr "Výchozí klávesové zkratky obnoveny" +msgid "" +"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] " +"Toggle colors" +msgstr "" + +#, fuzzy +msgid "Terminal colors:" +msgstr "Informace o terminálu:" + +#, fuzzy +msgid "WeeChat colors:" +msgstr "datum kompilace WeeChat" + +#, fuzzy +msgid "fixed color" +msgstr "barva textu" + +#, fuzzy +msgid "WeeChat basic colors:" +msgstr "adresář WeeChat" + +#, fuzzy +msgid "Nick colors:" +msgstr "barva" + +#, fuzzy +msgid "Palette colors:" +msgstr "Výchozí klávesové zkratky obnoveny" + msgid "Terminal lost, exiting WeeChat..." msgstr "Terminál ztracen, ukončuji WeeChat..." @@ -3209,6 +3279,10 @@ msgid "%s%s: unknown option for \"%s\" command" msgstr "%s%s: neznámá volba pro příkaz \"%s\"" #, c-format +msgid "%s%s: command \"%s\" must be executed on connected irc server" +msgstr "%s%s: příkaz \"%s\" nemůže být spuštěn v připojeném irc serveru" + +#, c-format msgid "%s%s: mask must begin with nick" msgstr "%s%s: maska musí začínat přezdívkou" @@ -4409,10 +4483,6 @@ msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)" msgstr "" "%s%s: příkaz \"%s\" nemůže být spuštěn v irc bufferu (server nebo kanál)" -#, c-format -msgid "%s%s: command \"%s\" must be executed on connected irc server" -msgstr "%s%s: příkaz \"%s\" nemůže být spuštěn v připojeném irc serveru" - msgid "current IRC server" msgstr "aktuální IRC server" @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-12-27 11:05+0100\n" -"PO-Revision-Date: 2010-12-21 17:42+0100\n" +"POT-Creation-Date: 2011-01-01 11:27+0100\n" +"PO-Revision-Date: 2010-12-27 17:08+0100\n" "Last-Translator: Nils G.\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: \n" @@ -154,10 +154,6 @@ msgid "No bar item defined" msgstr "Es wurde kein Bar-Item festgelegt" #, c-format -msgid "%sError: missing arguments for \"%s\" command" -msgstr "%sFehler: fehlende Argumente für den Befehl \"%s\"" - -#, c-format msgid "%sNot enough memory" msgstr "%sNicht genügend Speicher" @@ -232,6 +228,14 @@ msgid "No local variable defined for buffer \"%s\"" msgstr "Keine lokale Variable definiert für Buffer \"%s\"" #, c-format +msgid "%sInvalid pair number \"%s\" (must be between %d and %d)" +msgstr "" + +#, c-format +msgid "%sColor \"%s\" is not defined in palette" +msgstr "" + +#, c-format msgid "%sPlugin \"%s\" not found" msgstr "%sErweiterung \"%s\" wurde nicht gefunden" @@ -275,6 +279,10 @@ msgid "Filter \"%s\" disabled" msgstr "Filter \"%s\" deaktiviert" #, c-format +msgid "%sError: missing arguments for \"%s\" command" +msgstr "%sFehler: fehlende Argumente für den Befehl \"%s\"" + +#, c-format msgid "%sError: filter \"%s\" already exists" msgstr "%sFehler: Filter \"%s\" existiert bereits" @@ -689,6 +697,10 @@ msgstr "%sFehler: Konfigurationsoption \"%s\" nicht gefunden" msgid "Option changed: " msgstr "Option geändert: " +#, fuzzy +msgid "Option created: " +msgstr "Option geändert: " + msgid "Option changed" msgstr "Option geändert" @@ -1014,6 +1026,32 @@ msgstr "" " wechselt zum nächsten Buffer:\n" " /buffer +1" +msgid "define custom colors and display palette of colors" +msgstr "" + +msgid "[add pair [alias] [fg,bg]] | [del pair] | switch" +msgstr "" + +msgid "" +" add: add a color pair\n" +" del: delete a color pair\n" +"switch: switch WeeChat/terminal colors\n" +" pair: pair number (>= 1)\n" +" alias: alias name for color (for example: \"orange\")\n" +" fg,bg: foreground and background pair number (-1 for default terminal " +"foreground or background)\n" +"\n" +"Without argument, this command displays colors in a new buffer.\n" +"\n" +"Examples:\n" +" add color 214 with alias \"orange\":\n" +" /color add 214 orange\n" +" add color 250 with orange on blue:\n" +" /color add 250 214,4 orange_blue\n" +" delete color 214:\n" +" /color del 214" +msgstr "" + msgid "launch explicit WeeChat or plugin command" msgstr "führe explizit einen WeeChat Befehl oder eine Erweiterung aus" @@ -1752,6 +1790,10 @@ msgstr "Eigenschaften die für den Buffer gesetzt werden können" msgid "properties that can be read on a buffer" msgstr "Eigenschaften die für den Buffer gelesen werden können" +#, fuzzy +msgid "color pairs" +msgstr "Farben" + msgid "configuration files" msgstr "Konfigurationsdateien" @@ -1822,11 +1864,11 @@ msgstr "\t\tEin neuer Tag bricht an. Heute ist %s" msgid "debug level for plugin (\"core\" for WeeChat core)" msgstr "Debug-Level für Erweiterung (\"core\" für den WeeChat Core)" +#, fuzzy msgid "" -"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is " -"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b " -"is redefinition of color (terminal must support it) (everything is optional " -"in this format and order is not important)" +"custom color in palette, format is: \"alias;fg,bg\" where alias is color " +"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything " +"is optional in this format and order is not important)" msgstr "" "Benutzerdefinierte Farbe in der Palette, Format: \"alias;fg,bg;r/g/b\" " "wobei Alias der Name der Farbe ist, fg,bg stellt \"Vordergrund,Hintergrund\" " @@ -2562,7 +2604,7 @@ msgstr "debug: lösche Datei: %s" #. TRANSLATORS: "%s" is translation of "second" or "seconds" #, c-format msgid "Upgrade done (%.02f %s)" -msgstr "" +msgstr "Upgrade durchgeführt (%.02f %s)" #, c-format msgid "%sError upgrading WeeChat with file \"%s\":" @@ -2642,6 +2684,35 @@ msgstr "Keine Unterstützung von Farben im Terminal." msgid "Default colors:" msgstr "Standardfarben:" +msgid "" +"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] " +"Toggle colors" +msgstr "" + +#, fuzzy +msgid "Terminal colors:" +msgstr "Terminal Informationen:" + +#, fuzzy +msgid "WeeChat colors:" +msgstr "Standardfarben:" + +#, fuzzy +msgid "fixed color" +msgstr "Textfarbe" + +#, fuzzy +msgid "WeeChat basic colors:" +msgstr "WeeChat Verzeichnis" + +#, fuzzy +msgid "Nick colors:" +msgstr "Farben" + +#, fuzzy +msgid "Palette colors:" +msgstr "Standardfarben:" + msgid "Terminal lost, exiting WeeChat..." msgstr "Terminal verloren, beende WeeChat..." @@ -3360,6 +3431,12 @@ msgid "%s%s: unknown option for \"%s\" command" msgstr "%s%s: Unbekannte Option für den Befehl \"%s\"" #, c-format +msgid "%s%s: command \"%s\" must be executed on connected irc server" +msgstr "" +"%s%s: Der Befehl \"%s\" kann nur bei einem verbundenen IRC-Server ausgeführt " +"werden" + +#, c-format msgid "%s%s: mask must begin with nick" msgstr "%s%s: Die Maske muss mit einem Nick beginnen" @@ -3822,11 +3899,9 @@ msgstr "Nickname: Nickname" msgid "join a channel" msgstr "einen Channel betreten" -#, fuzzy msgid "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]" -msgstr "[channel1[,channel2[,channel3]] [key1[,key2]]]" +msgstr "[-server server] [channel1[,channel2[,channel3]] [key1[,key2]]]" -#, fuzzy msgid "" " server: send to this server (internal name)\n" "channel: channel name to join\n" @@ -3838,13 +3913,15 @@ msgid "" " /join #protectedchan,#weechat key\n" " /join -server freenode #weechat" msgstr "" +" server: sendet an diesen Server (interner Name)\n" "channel: Name des Channels der betreten werden soll\n" " key: Zugriffsschlüssel für einen Channel (Channels die einen " "Zugriffsschlüssel benötigen müssen zuerst aufgeführt werden)\n" "\n" -"Examples:\n" +"Beispiele:\n" " /join #weechat\n" -" /join #geschützterChannel,#weechat Zugriffsschlüssel" +" /join #geschützterChannel,#weechat Zugriffsschlüssel\n" +" /join -server freenode #weechat" msgid "forcibly remove a user from a channel" msgstr "Einen User aus einem Channel herauskicken" @@ -4594,12 +4671,6 @@ msgstr "" "%s%s: Der Befehl \"%s\" kann nur im IRC-Buffer ausgeführt werden (Server " "oder Channel)" -#, c-format -msgid "%s%s: command \"%s\" must be executed on connected irc server" -msgstr "" -"%s%s: Der Befehl \"%s\" kann nur bei einem verbundenen IRC-Server ausgeführt " -"werden" - msgid "current IRC server" msgstr "aktueller IRC-Server" @@ -6265,7 +6336,7 @@ msgid "WeeChat site, download page" msgstr "Download-Seite von WeeChat" msgid "1 if WeeChat is upgrading (command `/upgrade`)" -msgstr "" +msgstr "1 falls WeeChat ein Upgrade durchführt (Befehl `/upgrade`)" msgid "terminal charset" msgstr "Terminal Zeichensatz" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.4-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-12-27 11:05+0100\n" +"POT-Creation-Date: 2011-01-01 11:27+0100\n" "PO-Revision-Date: 2010-11-06 11:56+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -147,10 +147,6 @@ msgid "No bar item defined" msgstr "Ningún elemento definido" #, c-format -msgid "%sError: missing arguments for \"%s\" command" -msgstr "%sError: faltan argumentos para el comando \"%s\"" - -#, c-format msgid "%sNot enough memory" msgstr "%sNo hay suficiente memoria" @@ -224,6 +220,14 @@ msgid "No local variable defined for buffer \"%s\"" msgstr "Ninguna variable local definida para el buffer \"%s\"" #, c-format +msgid "%sInvalid pair number \"%s\" (must be between %d and %d)" +msgstr "" + +#, c-format +msgid "%sColor \"%s\" is not defined in palette" +msgstr "" + +#, c-format msgid "%sPlugin \"%s\" not found" msgstr "%sPlugin \"%s\" no encontrado" @@ -267,6 +271,10 @@ msgid "Filter \"%s\" disabled" msgstr "Filtro \"%s\" desactivado" #, c-format +msgid "%sError: missing arguments for \"%s\" command" +msgstr "%sError: faltan argumentos para el comando \"%s\"" + +#, c-format msgid "%sError: filter \"%s\" already exists" msgstr "%sError: el filtro \"%s\" ya existe" @@ -677,6 +685,10 @@ msgstr "%sError: opción de configuración \"%s\" no encontrada" msgid "Option changed: " msgstr "Opción cambiada: " +#, fuzzy +msgid "Option created: " +msgstr "Opción cambiada: " + msgid "Option changed" msgstr "Opción cambiada" @@ -998,6 +1010,32 @@ msgstr "" " ir al buffer siguiente:\n" " /buffer +1" +msgid "define custom colors and display palette of colors" +msgstr "" + +msgid "[add pair [alias] [fg,bg]] | [del pair] | switch" +msgstr "" + +msgid "" +" add: add a color pair\n" +" del: delete a color pair\n" +"switch: switch WeeChat/terminal colors\n" +" pair: pair number (>= 1)\n" +" alias: alias name for color (for example: \"orange\")\n" +" fg,bg: foreground and background pair number (-1 for default terminal " +"foreground or background)\n" +"\n" +"Without argument, this command displays colors in a new buffer.\n" +"\n" +"Examples:\n" +" add color 214 with alias \"orange\":\n" +" /color add 214 orange\n" +" add color 250 with orange on blue:\n" +" /color add 250 214,4 orange_blue\n" +" delete color 214:\n" +" /color del 214" +msgstr "" + msgid "launch explicit WeeChat or plugin command" msgstr "lanza explícitamente un comando de WeeChat o plugin" @@ -1706,6 +1744,10 @@ msgstr "propiedades del buffer que pueden configurarse" msgid "properties that can be read on a buffer" msgstr "propiedades del buffer que pueden leerse" +#, fuzzy +msgid "color pairs" +msgstr "color" + msgid "configuration files" msgstr "archivos de configuración" @@ -1776,10 +1818,9 @@ msgid "debug level for plugin (\"core\" for WeeChat core)" msgstr "nivel de depurado para el plugin (\"core\" para el núcleo de WeeChat)" msgid "" -"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is " -"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b " -"is redefinition of color (terminal must support it) (everything is optional " -"in this format and order is not important)" +"custom color in palette, format is: \"alias;fg,bg\" where alias is color " +"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything " +"is optional in this format and order is not important)" msgstr "" #, fuzzy, c-format @@ -2559,6 +2600,35 @@ msgstr "" msgid "Default colors:" msgstr "Atajos predefinidos restaurados" +msgid "" +"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] " +"Toggle colors" +msgstr "" + +#, fuzzy +msgid "Terminal colors:" +msgstr "Información de la terminal:" + +#, fuzzy +msgid "WeeChat colors:" +msgstr "fecha de compilación de WeeChat" + +#, fuzzy +msgid "fixed color" +msgstr "color del texto" + +#, fuzzy +msgid "WeeChat basic colors:" +msgstr "directorio de WeeChat" + +#, fuzzy +msgid "Nick colors:" +msgstr "color" + +#, fuzzy +msgid "Palette colors:" +msgstr "Atajos predefinidos restaurados" + msgid "Terminal lost, exiting WeeChat..." msgstr "Se perdió la terminal, cerrando WeeChat..." @@ -3254,6 +3324,10 @@ msgid "%s%s: unknown option for \"%s\" command" msgstr "%s%s: opción desconocida para el comando \"%s\"" #, c-format +msgid "%s%s: command \"%s\" must be executed on connected irc server" +msgstr "%s%s: el comando \"%s\"debe ser ejecutado en un servidor irc conectado" + +#, c-format msgid "%s%s: mask must begin with nick" msgstr "%s%s: la máscara debe empezar con el apodo" @@ -4463,10 +4537,6 @@ msgstr "" "%s%s: el comando \"%s\" debe ser ejecutado en un buffer irc (canal o " "servidor)" -#, c-format -msgid "%s%s: command \"%s\" must be executed on connected irc server" -msgstr "%s%s: el comando \"%s\"debe ser ejecutado en un servidor irc conectado" - msgid "current IRC server" msgstr "servidor IRC actual" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.4-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-12-27 11:05+0100\n" -"PO-Revision-Date: 2010-12-27 11:06+0100\n" +"POT-Creation-Date: 2011-01-01 11:27+0100\n" +"PO-Revision-Date: 2011-01-01 11:27+0100\n" "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: French\n" @@ -148,10 +148,6 @@ msgid "No bar item defined" msgstr "Pas d'objet de barre défini" #, c-format -msgid "%sError: missing arguments for \"%s\" command" -msgstr "%sErreur: paramètres manquants pour la commande \"%s\"" - -#, c-format msgid "%sNot enough memory" msgstr "%sPas assez de mémoire" @@ -225,6 +221,14 @@ msgid "No local variable defined for buffer \"%s\"" msgstr "Pas de variable locale définie pour le tampon \"%s\"" #, c-format +msgid "%sInvalid pair number \"%s\" (must be between %d and %d)" +msgstr "%sNuméro de paire invalide \"%s\" (doit être entre %d et %d)" + +#, c-format +msgid "%sColor \"%s\" is not defined in palette" +msgstr "%sLa couleur \"%s\" n'est pas définie dans la palette" + +#, c-format msgid "%sPlugin \"%s\" not found" msgstr "%sExtension \"%s\" non trouvée" @@ -267,6 +271,10 @@ msgid "Filter \"%s\" disabled" msgstr "Filtre \"%s\" désactivé" #, c-format +msgid "%sError: missing arguments for \"%s\" command" +msgstr "%sErreur: paramètres manquants pour la commande \"%s\"" + +#, c-format msgid "%sError: filter \"%s\" already exists" msgstr "%sErreur: le filtre \"%s\" existe déjà" @@ -681,6 +689,9 @@ msgstr "%sErreur: option de configuration \"%s\" non trouvée" msgid "Option changed: " msgstr "Option modifiée: " +msgid "Option created: " +msgstr "Option créée: " + msgid "Option changed" msgstr "Option modifiée" @@ -1002,6 +1013,50 @@ msgstr "" " aller au tampon suivant:\n" " /buffer +1" +msgid "define custom colors and display palette of colors" +msgstr "" +"définir des couleurs personnalisées et afficher la palette des couleurs" + +msgid "[add pair [alias] [fg,bg]] | [del pair] | switch" +msgstr "[add paire [alias] [fg,bg]] | [del paire] | switch" + +msgid "" +" add: add a color pair\n" +" del: delete a color pair\n" +"switch: switch WeeChat/terminal colors\n" +" pair: pair number (>= 1)\n" +" alias: alias name for color (for example: \"orange\")\n" +" fg,bg: foreground and background pair number (-1 for default terminal " +"foreground or background)\n" +"\n" +"Without argument, this command displays colors in a new buffer.\n" +"\n" +"Examples:\n" +" add color 214 with alias \"orange\":\n" +" /color add 214 orange\n" +" add color 250 with orange on blue:\n" +" /color add 250 214,4 orange_blue\n" +" delete color 214:\n" +" /color del 214" +msgstr "" +" add: ajouter une paire de couleur\n" +" del: supprimer une paire de couleur\n" +"switch: basculer entre les couleurs WeeChat et du terminal\n" +" paire: numéro de paire (>= 1)\n" +" alias: nom d'alias pour la couleur (par exemple: \"orange\")\n" +" fg,bg: numéro de paire pour le texte et le fond (-1 pour la couleur par " +"défaut du terminal pour le texte ou le fond)\n" +"\n" +"Sans paramètre, cette commande affiche les couleurs dans un nouveau tampon.\n" +"\n" +"Exemples:\n" +" ajouter la couleur 214 avec l'alias \"orange\":\n" +" /color add 214 orange\n" +" ajouter la couleur 250 avec orange sur bleu:\n" +" /color add 250 214,4 orange_bleu\n" +" supprimer la couleur 214:\n" +" /color del 214" + msgid "launch explicit WeeChat or plugin command" msgstr "lancer explicitement une commande WeeChat ou d'une extension" @@ -1721,6 +1776,9 @@ msgstr "propriétés qui peuvent être changées sur un tampon" msgid "properties that can be read on a buffer" msgstr "propriétés qui peuvent être lues sur un tampon" +msgid "color pairs" +msgstr "paires de couleur" + msgid "configuration files" msgstr "fichiers de configuration" @@ -1792,15 +1850,14 @@ msgid "debug level for plugin (\"core\" for WeeChat core)" msgstr "niveau de debug pour l'extension (\"core\" pour le coeur de WeeChat)" msgid "" -"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is " -"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b " -"is redefinition of color (terminal must support it) (everything is optional " -"in this format and order is not important)" +"custom color in palette, format is: \"alias;fg,bg\" where alias is color " +"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything " +"is optional in this format and order is not important)" msgstr "" -"couleur personnalisée dans la palette, le format est: \"alias;fg,bg;r/g/b\" " -"où alias est le nom de la couleur, fg,bg est \"texte,fond\" (par exemple: " -"\"200,-1\"), r/g/b est la redéfinition de la couleur (le terminal doit le " -"supporter) (tout est optionnel dans ce format et l'ordre n'est pas important)" +"couleur personnalisée dans la palette, le format est: \"alias;fg,bg\" où " +"alias est le nom de la couleur, fg,bg est \"texte,fond\" (par exemple: " +"\"200,-1\") (tout est optionnel dans ce format et l'ordre n'est pas " +"important)" #, c-format msgid "%sError: palette option must be numeric" @@ -2601,6 +2658,31 @@ msgstr "Pas de support pour la couleur dans le terminal." msgid "Default colors:" msgstr "Couleurs par défaut:" +msgid "" +"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] " +"Toggle colors" +msgstr "" +"Couleurs WeeChat | Actions: [R] Rafraîchir [Q] Fermer le tampon | Touches: " +"[alt-c] Basculer les couleurs" + +msgid "Terminal colors:" +msgstr "Couleurs du terminal:" + +msgid "WeeChat colors:" +msgstr "Couleurs WeeChat:" + +msgid "fixed color" +msgstr "couleur fixe" + +msgid "WeeChat basic colors:" +msgstr "Couleurs de base WeeChat:" + +msgid "Nick colors:" +msgstr "Couleurs des pseudos:" + +msgid "Palette colors:" +msgstr "Couleurs de la palette:" + msgid "Terminal lost, exiting WeeChat..." msgstr "Terminal perdu, sortie de WeeChat..." @@ -3306,6 +3388,11 @@ msgid "%s%s: unknown option for \"%s\" command" msgstr "%s%s: option inconnue pour la commande \"%s\"" #, c-format +msgid "%s%s: command \"%s\" must be executed on connected irc server" +msgstr "" +"%s%s: la commande \"%s\" doit être exécutée sur un serveur irc connecté" + +#, c-format msgid "%s%s: mask must begin with nick" msgstr "%s%s: le masque doit commencer par un pseudo" @@ -4530,11 +4617,6 @@ msgstr "" "%s%s: la commande \"%s\" doit être exécutée sur un tampon irc (serveur ou " "canal)" -#, c-format -msgid "%s%s: command \"%s\" must be executed on connected irc server" -msgstr "" -"%s%s: la commande \"%s\" doit être exécutée sur un serveur irc connecté" - msgid "current IRC server" msgstr "serveur IRC courant" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.4-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-12-27 11:05+0100\n" +"POT-Creation-Date: 2011-01-01 11:27+0100\n" "PO-Revision-Date: 2010-11-05 17:17+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -148,10 +148,6 @@ msgid "No bar item defined" msgstr "Nincs aliasz definiálva.\n" #, fuzzy, c-format -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" @@ -226,6 +222,14 @@ msgstr "a pufferek időbélyege" msgid "No local variable defined for buffer \"%s\"" msgstr "" +#, c-format +msgid "%sInvalid pair number \"%s\" (must be between %d and %d)" +msgstr "" + +#, c-format +msgid "%sColor \"%s\" is not defined in palette" +msgstr "" + #, fuzzy, c-format msgid "%sPlugin \"%s\" not found" msgstr "%s cím \"%s\" nem található\n" @@ -273,6 +277,10 @@ msgid "Filter \"%s\" disabled" msgstr "a felhasználók le lettek tiltva" #, fuzzy, c-format +msgid "%sError: missing arguments for \"%s\" command" +msgstr "%s hiányzó argumentum a \"%s\" parancsnak\n" + +#, fuzzy, c-format msgid "%sError: filter \"%s\" already exists" msgstr "%s az ignore már létezik\n" @@ -729,6 +737,10 @@ msgid "Option changed: " msgstr "nincs a szobában" #, fuzzy +msgid "Option created: " +msgstr "nincs a szobában" + +#, fuzzy msgid "Option changed" msgstr "nincs a szobában" @@ -974,6 +986,32 @@ msgstr "" " ugrás 20 sorral feljebb: /buffer scroll -20\n" " ugrás a #weechat szobára: /buffer #weechat" +msgid "define custom colors and display palette of colors" +msgstr "" + +msgid "[add pair [alias] [fg,bg]] | [del pair] | switch" +msgstr "" + +msgid "" +" add: add a color pair\n" +" del: delete a color pair\n" +"switch: switch WeeChat/terminal colors\n" +" pair: pair number (>= 1)\n" +" alias: alias name for color (for example: \"orange\")\n" +" fg,bg: foreground and background pair number (-1 for default terminal " +"foreground or background)\n" +"\n" +"Without argument, this command displays colors in a new buffer.\n" +"\n" +"Examples:\n" +" add color 214 with alias \"orange\":\n" +" /color add 214 orange\n" +" add color 250 with orange on blue:\n" +" /color add 250 214,4 orange_blue\n" +" delete color 214:\n" +" /color del 214" +msgstr "" + msgid "launch explicit WeeChat or plugin command" msgstr "" @@ -1500,6 +1538,10 @@ msgid "properties that can be read on a buffer" msgstr "puffer betöltése sikertelen" #, fuzzy +msgid "color pairs" +msgstr "üzenetek színe" + +#, fuzzy msgid "configuration files" msgstr "szerver konfigurációs fájljának újraolvastatása" @@ -1586,10 +1628,9 @@ msgid "debug level for plugin (\"core\" for WeeChat core)" msgstr "" msgid "" -"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is " -"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b " -"is redefinition of color (terminal must support it) (everything is optional " -"in this format and order is not important)" +"custom color in palette, format is: \"alias;fg,bg\" where alias is color " +"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything " +"is optional in this format and order is not important)" msgstr "" #, fuzzy, c-format @@ -2352,6 +2393,35 @@ msgstr "" msgid "Default colors:" msgstr "Alapértelmezett billentyűparancsok visszaállítva\n" +msgid "" +"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] " +"Toggle colors" +msgstr "" + +#, fuzzy +msgid "Terminal colors:" +msgstr "pufferek kezelése" + +#, fuzzy +msgid "WeeChat colors:" +msgstr "Konfigurációs fájl elmentve\n" + +#, fuzzy +msgid "fixed color" +msgstr "üzenetek színe" + +#, fuzzy +msgid "WeeChat basic colors:" +msgstr "WeeChat Hiba:" + +#, fuzzy +msgid "Nick colors:" +msgstr "üzenetek színe" + +#, fuzzy +msgid "Palette colors:" +msgstr "Alapértelmezett billentyűparancsok visszaállítva\n" + msgid "Terminal lost, exiting WeeChat..." msgstr "" @@ -3003,6 +3073,10 @@ msgstr "%s helytelen pufferszám\n" msgid "%s%s: unknown option for \"%s\" command" msgstr "%s ismeretlen opció a \"%s\" parancsnak\n" +#, fuzzy, c-format +msgid "%s%s: command \"%s\" must be executed on connected irc server" +msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n" + #, c-format msgid "%s%s: mask must begin with nick" msgstr "" @@ -4149,10 +4223,6 @@ msgstr "%s rossz argumentum a \"%s\" parancsnak\n" msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)" msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n" -#, fuzzy, c-format -msgid "%s%s: command \"%s\" must be executed on connected irc server" -msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n" - #, fuzzy msgid "current IRC server" msgstr "csatlakozás a szerver(ek)hez" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.4-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-12-27 11:05+0100\n" +"POT-Creation-Date: 2011-01-01 11:27+0100\n" "PO-Revision-Date: 2010-12-22 11:02+0100\n" "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -146,10 +146,6 @@ msgid "No bar item defined" msgstr "Nessun elemento barra definito" #, c-format -msgid "%sError: missing arguments for \"%s\" command" -msgstr "%sErrore: argomento mancante per il comando \"%s\"" - -#, c-format msgid "%sNot enough memory" msgstr "%sSpazio non sufficiente" @@ -223,6 +219,14 @@ msgid "No local variable defined for buffer \"%s\"" msgstr "Nessuna variabile locale definita per il buffer \"%s\"" #, c-format +msgid "%sInvalid pair number \"%s\" (must be between %d and %d)" +msgstr "" + +#, c-format +msgid "%sColor \"%s\" is not defined in palette" +msgstr "" + +#, c-format msgid "%sPlugin \"%s\" not found" msgstr "%sPlugin \"%s\" non trovato" @@ -265,6 +269,10 @@ msgid "Filter \"%s\" disabled" msgstr "Filtro \"%s\" disabilitato" #, c-format +msgid "%sError: missing arguments for \"%s\" command" +msgstr "%sErrore: argomento mancante per il comando \"%s\"" + +#, c-format msgid "%sError: filter \"%s\" already exists" msgstr "%sErrore: il filtro \"%s\" esiste già" @@ -676,6 +684,10 @@ msgstr "%sErrore: opzione di configurazione \"%s\" non trovata" msgid "Option changed: " msgstr "Opzione modificata: " +#, fuzzy +msgid "Option created: " +msgstr "Opzione modificata: " + msgid "Option changed" msgstr "Opzione modificata" @@ -992,6 +1004,32 @@ msgstr "" " salta al buffer successivo:\n" " /buffer +1" +msgid "define custom colors and display palette of colors" +msgstr "" + +msgid "[add pair [alias] [fg,bg]] | [del pair] | switch" +msgstr "" + +msgid "" +" add: add a color pair\n" +" del: delete a color pair\n" +"switch: switch WeeChat/terminal colors\n" +" pair: pair number (>= 1)\n" +" alias: alias name for color (for example: \"orange\")\n" +" fg,bg: foreground and background pair number (-1 for default terminal " +"foreground or background)\n" +"\n" +"Without argument, this command displays colors in a new buffer.\n" +"\n" +"Examples:\n" +" add color 214 with alias \"orange\":\n" +" /color add 214 orange\n" +" add color 250 with orange on blue:\n" +" /color add 250 214,4 orange_blue\n" +" delete color 214:\n" +" /color del 214" +msgstr "" + msgid "launch explicit WeeChat or plugin command" msgstr "esegui comando o plugin di WeeChat esplicito" @@ -1712,6 +1750,10 @@ msgstr "proprietà che possono essere impostate su un buffer" msgid "properties that can be read on a buffer" msgstr "proprietà che possono essere lette su un buffer" +#, fuzzy +msgid "color pairs" +msgstr "colori" + msgid "configuration files" msgstr "file di configurazione" @@ -1782,11 +1824,11 @@ msgstr "\t\tOggi è %s" msgid "debug level for plugin (\"core\" for WeeChat core)" msgstr "livello di debug per il plugin (\"core\" per il core di WeeChat)" +#, fuzzy msgid "" -"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is " -"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b " -"is redefinition of color (terminal must support it) (everything is optional " -"in this format and order is not important)" +"custom color in palette, format is: \"alias;fg,bg\" where alias is color " +"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything " +"is optional in this format and order is not important)" msgstr "" "colore personalizzato nella tavolozza, il formato è \"alias;fg,bg;r/g/b\" " "dove l'alias è il nome del colore, fg,bg sono \"colore di primo piano,colore " @@ -2576,6 +2618,35 @@ msgstr "Nessun supporto al colore nel terminale." msgid "Default colors:" msgstr "Colori predefiniti:" +msgid "" +"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] " +"Toggle colors" +msgstr "" + +#, fuzzy +msgid "Terminal colors:" +msgstr "Informazioni sul terminale:" + +#, fuzzy +msgid "WeeChat colors:" +msgstr "data di compilazione di WeeChat" + +#, fuzzy +msgid "fixed color" +msgstr "colore del testo" + +#, fuzzy +msgid "WeeChat basic colors:" +msgstr "cartella WeeChat" + +#, fuzzy +msgid "Nick colors:" +msgstr "colori" + +#, fuzzy +msgid "Palette colors:" +msgstr "Colori predefiniti:" + msgid "Terminal lost, exiting WeeChat..." msgstr "Terminale perduto, chiusura di WeeChat..." @@ -3276,6 +3347,10 @@ msgid "%s%s: unknown option for \"%s\" command" msgstr "%s%s: opzione sconosciuta per il comando \"%s\"" #, c-format +msgid "%s%s: command \"%s\" must be executed on connected irc server" +msgstr "%s%s: il comando \"%s\" deve essere eseguito su un server IRC connesso" + +#, c-format msgid "%s%s: mask must begin with nick" msgstr "%s%s: la mask deve iniziare col nick" @@ -4496,10 +4571,6 @@ msgstr "" "%s%s: il comando \"%s\" deve essere eseguito su un buffer IRC (server o " "canale)" -#, c-format -msgid "%s%s: command \"%s\" must be executed on connected irc server" -msgstr "%s%s: il comando \"%s\" deve essere eseguito su un server IRC connesso" - msgid "current IRC server" msgstr "server IRC corrente" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.4-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-12-27 11:05+0100\n" +"POT-Creation-Date: 2011-01-01 11:27+0100\n" "PO-Revision-Date: 2010-11-06 11:56+0100\n" "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -149,10 +149,6 @@ msgid "No bar item defined" msgstr "Nie zdefiniowano elementów paska" #, c-format -msgid "%sError: missing arguments for \"%s\" command" -msgstr "%sBłąd: brak argumentów dla komendy \"%s\"" - -#, c-format msgid "%sNot enough memory" msgstr "%sZa mało pamięci" @@ -226,6 +222,14 @@ msgid "No local variable defined for buffer \"%s\"" msgstr "Żadne lokalne zmienne nie zostały zdefiniowane dla bufora \"%s\"" #, c-format +msgid "%sInvalid pair number \"%s\" (must be between %d and %d)" +msgstr "" + +#, c-format +msgid "%sColor \"%s\" is not defined in palette" +msgstr "" + +#, c-format msgid "%sPlugin \"%s\" not found" msgstr "%sNie odnaleziono wtyczki \"%s\"" @@ -268,6 +272,10 @@ msgid "Filter \"%s\" disabled" msgstr "Filtr \"%s\" wyłączony" #, c-format +msgid "%sError: missing arguments for \"%s\" command" +msgstr "%sBłąd: brak argumentów dla komendy \"%s\"" + +#, c-format msgid "%sError: filter \"%s\" already exists" msgstr "%sBłąd: filtr \"%s\" już istnieje" @@ -687,6 +695,10 @@ msgstr "%sBłąd: nie znaleziono opcji konfiguracyjnej \"%s\" " msgid "Option changed: " msgstr "Opcja zmieniona:" +#, fuzzy +msgid "Option created: " +msgstr "Opcja zmieniona:" + msgid "Option changed" msgstr "Zmieniono opcję" @@ -1006,6 +1018,32 @@ msgstr "" " przechodzi do następnego buforu:\n" " /buffer +1" +msgid "define custom colors and display palette of colors" +msgstr "" + +msgid "[add pair [alias] [fg,bg]] | [del pair] | switch" +msgstr "" + +msgid "" +" add: add a color pair\n" +" del: delete a color pair\n" +"switch: switch WeeChat/terminal colors\n" +" pair: pair number (>= 1)\n" +" alias: alias name for color (for example: \"orange\")\n" +" fg,bg: foreground and background pair number (-1 for default terminal " +"foreground or background)\n" +"\n" +"Without argument, this command displays colors in a new buffer.\n" +"\n" +"Examples:\n" +" add color 214 with alias \"orange\":\n" +" /color add 214 orange\n" +" add color 250 with orange on blue:\n" +" /color add 250 214,4 orange_blue\n" +" delete color 214:\n" +" /color del 214" +msgstr "" + msgid "launch explicit WeeChat or plugin command" msgstr "wywołaj wyraźnie komendę WeeChat lub pluginu" @@ -1713,6 +1751,10 @@ msgstr "właściwości, jakie mogą być ustawione w buforze" msgid "properties that can be read on a buffer" msgstr "właściwości, jakie moga być przeczytane w buforze" +#, fuzzy +msgid "color pairs" +msgstr "kolor" + msgid "configuration files" msgstr "pliki konfiguracyjne" @@ -1784,10 +1826,9 @@ msgid "debug level for plugin (\"core\" for WeeChat core)" msgstr "poziom debugowania dla wtyczki (\"core\" dla rdzenia WeeChat)" msgid "" -"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is " -"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b " -"is redefinition of color (terminal must support it) (everything is optional " -"in this format and order is not important)" +"custom color in palette, format is: \"alias;fg,bg\" where alias is color " +"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything " +"is optional in this format and order is not important)" msgstr "" #, fuzzy, c-format @@ -2555,6 +2596,35 @@ msgstr "" msgid "Default colors:" msgstr "Przywrócono domyślne przypisania klawiszy" +msgid "" +"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] " +"Toggle colors" +msgstr "" + +#, fuzzy +msgid "Terminal colors:" +msgstr "Informacje terminala:" + +#, fuzzy +msgid "WeeChat colors:" +msgstr "data kompilacji WeeChat" + +#, fuzzy +msgid "fixed color" +msgstr "kolor tekstu" + +#, fuzzy +msgid "WeeChat basic colors:" +msgstr "katalog Weechat" + +#, fuzzy +msgid "Nick colors:" +msgstr "kolor" + +#, fuzzy +msgid "Palette colors:" +msgstr "Przywrócono domyślne przypisania klawiszy" + msgid "Terminal lost, exiting WeeChat..." msgstr "Utracono terminal, wychodzę z WeeChat..." @@ -3245,6 +3315,10 @@ msgid "%s%s: unknown option for \"%s\" command" msgstr "%s%s: nieznana opcja dla komendy \"%s\"" #, c-format +msgid "%s%s: command \"%s\" must be executed on connected irc server" +msgstr "%s%s: komenda \"%s\" musi zostać wykonana na połączonym serwerze irc" + +#, c-format msgid "%s%s: mask must begin with nick" msgstr "%s%s: maska musi zaczynać się od nicka" @@ -4446,10 +4520,6 @@ msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)" msgstr "" "%s%s: komenda \"%s\" musi zostać wykonana w buforze irc (serwer lub kanał)" -#, c-format -msgid "%s%s: command \"%s\" must be executed on connected irc server" -msgstr "%s%s: komenda \"%s\" musi zostać wykonana na połączonym serwerze irc" - msgid "current IRC server" msgstr "obecny serwer IRC" diff --git a/po/pt_BR.po b/po/pt_BR.po index bdf040755..3898ec9d3 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.4-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-12-27 11:05+0100\n" +"POT-Creation-Date: 2011-01-01 11:27+0100\n" "PO-Revision-Date: 2010-11-13 09:26+0100\n" "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -147,10 +147,6 @@ msgid "No bar item defined" msgstr "Nenhum item da barra definido" #, c-format -msgid "%sError: missing arguments for \"%s\" command" -msgstr "%sErro: faltando argumentos para o comando \"%s\"" - -#, c-format msgid "%sNot enough memory" msgstr "%sMemória insuficiente" @@ -224,6 +220,14 @@ msgid "No local variable defined for buffer \"%s\"" msgstr "Nenhuma variável local definida para o buffer \"%s\"" #, c-format +msgid "%sInvalid pair number \"%s\" (must be between %d and %d)" +msgstr "" + +#, c-format +msgid "%sColor \"%s\" is not defined in palette" +msgstr "" + +#, c-format msgid "%sPlugin \"%s\" not found" msgstr "%sPlugin \"%s\" não encontrado" @@ -266,6 +270,10 @@ msgid "Filter \"%s\" disabled" msgstr "Filtro \"%s\" desabilitado" #, c-format +msgid "%sError: missing arguments for \"%s\" command" +msgstr "%sErro: faltando argumentos para o comando \"%s\"" + +#, c-format msgid "%sError: filter \"%s\" already exists" msgstr "%sErro: filtro \"%s\" já existe" @@ -685,6 +693,10 @@ msgstr "%sErro: opção de configuração \"%s\" não encontrada" msgid "Option changed: " msgstr "Opção mudada: " +#, fuzzy +msgid "Option created: " +msgstr "Opção mudada: " + msgid "Option changed" msgstr "Opção mudada" @@ -903,6 +915,32 @@ msgid "" " /buffer +1" msgstr "" +msgid "define custom colors and display palette of colors" +msgstr "" + +msgid "[add pair [alias] [fg,bg]] | [del pair] | switch" +msgstr "" + +msgid "" +" add: add a color pair\n" +" del: delete a color pair\n" +"switch: switch WeeChat/terminal colors\n" +" pair: pair number (>= 1)\n" +" alias: alias name for color (for example: \"orange\")\n" +" fg,bg: foreground and background pair number (-1 for default terminal " +"foreground or background)\n" +"\n" +"Without argument, this command displays colors in a new buffer.\n" +"\n" +"Examples:\n" +" add color 214 with alias \"orange\":\n" +" /color add 214 orange\n" +" add color 250 with orange on blue:\n" +" /color add 250 214,4 orange_blue\n" +" delete color 214:\n" +" /color del 214" +msgstr "" + msgid "launch explicit WeeChat or plugin command" msgstr "" @@ -1350,6 +1388,10 @@ msgstr "" msgid "properties that can be read on a buffer" msgstr "" +#, fuzzy +msgid "color pairs" +msgstr "cor" + msgid "configuration files" msgstr "" @@ -1417,10 +1459,9 @@ msgid "debug level for plugin (\"core\" for WeeChat core)" msgstr "" msgid "" -"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is " -"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b " -"is redefinition of color (terminal must support it) (everything is optional " -"in this format and order is not important)" +"custom color in palette, format is: \"alias;fg,bg\" where alias is color " +"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything " +"is optional in this format and order is not important)" msgstr "" #, fuzzy, c-format @@ -2081,6 +2122,35 @@ msgstr "" msgid "Default colors:" msgstr "comando padrão:" +msgid "" +"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] " +"Toggle colors" +msgstr "" + +#, fuzzy +msgid "Terminal colors:" +msgstr "comando padrão:" + +#, fuzzy +msgid "WeeChat colors:" +msgstr "comando padrão:" + +#, fuzzy +msgid "fixed color" +msgstr "cor" + +#, fuzzy +msgid "WeeChat basic colors:" +msgstr "comando padrão:" + +#, fuzzy +msgid "Nick colors:" +msgstr "cor" + +#, fuzzy +msgid "Palette colors:" +msgstr "comando padrão:" + msgid "Terminal lost, exiting WeeChat..." msgstr "" @@ -2693,6 +2763,10 @@ msgid "%s%s: unknown option for \"%s\" command" msgstr "" #, c-format +msgid "%s%s: command \"%s\" must be executed on connected irc server" +msgstr "" + +#, c-format msgid "%s%s: mask must begin with nick" msgstr "" @@ -3626,10 +3700,6 @@ msgstr "" msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)" msgstr "" -#, c-format -msgid "%s%s: command \"%s\" must be executed on connected irc server" -msgstr "" - msgid "current IRC server" msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.4-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-12-27 11:05+0100\n" +"POT-Creation-Date: 2011-01-01 11:27+0100\n" "PO-Revision-Date: 2010-11-05 17:17+0100\n" "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -151,10 +151,6 @@ msgid "No bar item defined" msgstr "Сокращения не заданы.\n" #, fuzzy, c-format -msgid "%sError: missing arguments for \"%s\" command" -msgstr "%s нет аргументов для \"%s\" команды\n" - -#, fuzzy, c-format msgid "%sNot enough memory" msgstr "Недостаточно памяти для новой строчки\n" @@ -229,6 +225,14 @@ msgstr "время в буферах" msgid "No local variable defined for buffer \"%s\"" msgstr "" +#, c-format +msgid "%sInvalid pair number \"%s\" (must be between %d and %d)" +msgstr "" + +#, c-format +msgid "%sColor \"%s\" is not defined in palette" +msgstr "" + #, fuzzy, c-format msgid "%sPlugin \"%s\" not found" msgstr "%s адрес \"%s\" не найден\n" @@ -276,6 +280,10 @@ msgid "Filter \"%s\" disabled" msgstr "команда users отключена" #, fuzzy, c-format +msgid "%sError: missing arguments for \"%s\" command" +msgstr "%s нет аргументов для \"%s\" команды\n" + +#, fuzzy, c-format msgid "%sError: filter \"%s\" already exists" msgstr "%s игнорирование уже существует\n" @@ -736,6 +744,10 @@ msgid "Option changed: " msgstr "не на канале" #, fuzzy +msgid "Option created: " +msgstr "не на канале" + +#, fuzzy msgid "Option changed" msgstr "не на канале" @@ -981,6 +993,32 @@ msgstr "" " отмотать 20 сообщений: /buffer scroll -20\n" " перейти к #weechat: /buffer #weechat" +msgid "define custom colors and display palette of colors" +msgstr "" + +msgid "[add pair [alias] [fg,bg]] | [del pair] | switch" +msgstr "" + +msgid "" +" add: add a color pair\n" +" del: delete a color pair\n" +"switch: switch WeeChat/terminal colors\n" +" pair: pair number (>= 1)\n" +" alias: alias name for color (for example: \"orange\")\n" +" fg,bg: foreground and background pair number (-1 for default terminal " +"foreground or background)\n" +"\n" +"Without argument, this command displays colors in a new buffer.\n" +"\n" +"Examples:\n" +" add color 214 with alias \"orange\":\n" +" /color add 214 orange\n" +" add color 250 with orange on blue:\n" +" /color add 250 214,4 orange_blue\n" +" delete color 214:\n" +" /color del 214" +msgstr "" + msgid "launch explicit WeeChat or plugin command" msgstr "" @@ -1509,6 +1547,10 @@ msgid "properties that can be read on a buffer" msgstr "загрузка буфера не удалась" #, fuzzy +msgid "color pairs" +msgstr "цвет чата" + +#, fuzzy msgid "configuration files" msgstr "перезагрузить конфигурационный файл сервера" @@ -1595,10 +1637,9 @@ msgid "debug level for plugin (\"core\" for WeeChat core)" msgstr "" msgid "" -"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is " -"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b " -"is redefinition of color (terminal must support it) (everything is optional " -"in this format and order is not important)" +"custom color in palette, format is: \"alias;fg,bg\" where alias is color " +"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything " +"is optional in this format and order is not important)" msgstr "" #, fuzzy, c-format @@ -2368,6 +2409,35 @@ msgstr "" msgid "Default colors:" msgstr "Комбинации клавиш по умолчанию восстановлены\n" +msgid "" +"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] " +"Toggle colors" +msgstr "" + +#, fuzzy +msgid "Terminal colors:" +msgstr "управление буферами" + +#, fuzzy +msgid "WeeChat colors:" +msgstr "Конфигурационный файл сохранён\n" + +#, fuzzy +msgid "fixed color" +msgstr "цвет чата" + +#, fuzzy +msgid "WeeChat basic colors:" +msgstr "Ошибка WeeChat:" + +#, fuzzy +msgid "Nick colors:" +msgstr "цвет чата" + +#, fuzzy +msgid "Palette colors:" +msgstr "Комбинации клавиш по умолчанию восстановлены\n" + msgid "Terminal lost, exiting WeeChat..." msgstr "" @@ -3022,6 +3092,10 @@ msgstr "%s неправильный номер буфера\n" msgid "%s%s: unknown option for \"%s\" command" msgstr "%s неизвестный параметр для команды \"%s\"\n" +#, fuzzy, c-format +msgid "%s%s: command \"%s\" must be executed on connected irc server" +msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n" + #, c-format msgid "%s%s: mask must begin with nick" msgstr "" @@ -4158,10 +4232,6 @@ msgstr "%s некорректные аргументы команды \"%s\"\n" msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)" msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n" -#, fuzzy, c-format -msgid "%s%s: command \"%s\" must be executed on connected irc server" -msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n" - #, fuzzy msgid "current IRC server" msgstr "подключиться к серверу(-ам)" diff --git a/po/weechat.pot b/po/weechat.pot index 2e0b33329..f3a943d44 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: 2010-12-27 11:05+0100\n" +"POT-Creation-Date: 2011-01-01 11:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -112,10 +112,6 @@ msgid "No bar item defined" msgstr "" #, c-format -msgid "%sError: missing arguments for \"%s\" command" -msgstr "" - -#, c-format msgid "%sNot enough memory" msgstr "" @@ -189,6 +185,14 @@ msgid "No local variable defined for buffer \"%s\"" msgstr "" #, c-format +msgid "%sInvalid pair number \"%s\" (must be between %d and %d)" +msgstr "" + +#, c-format +msgid "%sColor \"%s\" is not defined in palette" +msgstr "" + +#, c-format msgid "%sPlugin \"%s\" not found" msgstr "" @@ -231,6 +235,10 @@ msgid "Filter \"%s\" disabled" msgstr "" #, c-format +msgid "%sError: missing arguments for \"%s\" command" +msgstr "" + +#, c-format msgid "%sError: filter \"%s\" already exists" msgstr "" @@ -635,6 +643,9 @@ msgstr "" msgid "Option changed: " msgstr "" +msgid "Option created: " +msgstr "" + msgid "Option changed" msgstr "" @@ -842,6 +853,32 @@ msgid "" " /buffer +1" msgstr "" +msgid "define custom colors and display palette of colors" +msgstr "" + +msgid "[add pair [alias] [fg,bg]] | [del pair] | switch" +msgstr "" + +msgid "" +" add: add a color pair\n" +" del: delete a color pair\n" +"switch: switch WeeChat/terminal colors\n" +" pair: pair number (>= 1)\n" +" alias: alias name for color (for example: \"orange\")\n" +" fg,bg: foreground and background pair number (-1 for default terminal " +"foreground or background)\n" +"\n" +"Without argument, this command displays colors in a new buffer.\n" +"\n" +"Examples:\n" +" add color 214 with alias \"orange\":\n" +" /color add 214 orange\n" +" add color 250 with orange on blue:\n" +" /color add 250 214,4 orange_blue\n" +" delete color 214:\n" +" /color del 214" +msgstr "" + msgid "launch explicit WeeChat or plugin command" msgstr "" @@ -1289,6 +1326,9 @@ msgstr "" msgid "properties that can be read on a buffer" msgstr "" +msgid "color pairs" +msgstr "" + msgid "configuration files" msgstr "" @@ -1356,10 +1396,9 @@ msgid "debug level for plugin (\"core\" for WeeChat core)" msgstr "" msgid "" -"custom color in palette, format is: \"alias;fg,bg;r/g/b\" where alias is " -"color name, fg,bg is \"foreground,background\" (example: \"200,-1\"), r/g/b " -"is redefinition of color (terminal must support it) (everything is optional " -"in this format and order is not important)" +"custom color in palette, format is: \"alias;fg,bg\" where alias is color " +"name, fg,bg is \"foreground,background\" (example: \"200,-1\") (everything " +"is optional in this format and order is not important)" msgstr "" #, c-format @@ -2019,6 +2058,29 @@ msgstr "" msgid "Default colors:" msgstr "" +msgid "" +"WeeChat colors | Actions: [R] Refresh [Q] Close buffer | Keys: [alt-c] " +"Toggle colors" +msgstr "" + +msgid "Terminal colors:" +msgstr "" + +msgid "WeeChat colors:" +msgstr "" + +msgid "fixed color" +msgstr "" + +msgid "WeeChat basic colors:" +msgstr "" + +msgid "Nick colors:" +msgstr "" + +msgid "Palette colors:" +msgstr "" + msgid "Terminal lost, exiting WeeChat..." msgstr "" @@ -2629,6 +2691,10 @@ msgid "%s%s: unknown option for \"%s\" command" msgstr "" #, c-format +msgid "%s%s: command \"%s\" must be executed on connected irc server" +msgstr "" + +#, c-format msgid "%s%s: mask must begin with nick" msgstr "" @@ -3562,10 +3628,6 @@ msgstr "" msgid "%s%s: command \"%s\" must be executed on irc buffer (server or channel)" msgstr "" -#, c-format -msgid "%s%s: command \"%s\" must be executed on connected irc server" -msgstr "" - msgid "current IRC server" msgstr "" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index dd1d3c95b..4fba9ccd9 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -150,9 +150,7 @@ command_bar_list (int full) * command_bar: manage bars */ -int -command_bar (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(bar) { int type, position; char *error, *str_type, *pos_condition; @@ -204,15 +202,7 @@ command_bar (void *data, struct t_gui_buffer *buffer, /* add a new bar */ if (string_strcasecmp (argv[1], "add") == 0) { - if (argc < 8) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "bar"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(8, "bar add"); pos_condition = strchr (argv[3], ','); if (pos_condition) { @@ -300,15 +290,7 @@ command_bar (void *data, struct t_gui_buffer *buffer, /* delete a bar */ if (string_strcasecmp (argv[1], "del") == 0) { - if (argc < 3) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "bar"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(3, "bar del"); if (string_strcasecmp (argv[2], "-all") == 0) { gui_bar_free_all (); @@ -337,15 +319,7 @@ command_bar (void *data, struct t_gui_buffer *buffer, /* set a bar property */ if (string_strcasecmp (argv[1], "set") == 0) { - if (argc < 5) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "bar"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(5, "bar set"); ptr_bar = gui_bar_search (argv[2]); if (!ptr_bar) { @@ -371,15 +345,7 @@ command_bar (void *data, struct t_gui_buffer *buffer, /* hide a bar */ if (string_strcasecmp (argv[1], "hide") == 0) { - if (argc < 3) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "bar"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(3, "bar hide"); ptr_bar = gui_bar_search (argv[2]); if (!ptr_bar) { @@ -398,15 +364,7 @@ command_bar (void *data, struct t_gui_buffer *buffer, /* show a bar */ if (string_strcasecmp (argv[1], "show") == 0) { - if (argc < 3) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "bar"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(3, "bar show"); ptr_bar = gui_bar_search (argv[2]); if (!ptr_bar) { @@ -425,15 +383,7 @@ command_bar (void *data, struct t_gui_buffer *buffer, /* toggle a bar visible/hidden */ if (string_strcasecmp (argv[1], "toggle") == 0) { - if (argc < 3) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "bar"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(3, "bar toggle"); ptr_bar = gui_bar_search (argv[2]); if (!ptr_bar) { @@ -452,15 +402,7 @@ command_bar (void *data, struct t_gui_buffer *buffer, /* scroll in a bar */ if (string_strcasecmp (argv[1], "scroll") == 0) { - if (argc < 5) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "bar"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(5, "bar scroll"); ptr_bar = gui_bar_search (argv[2]); if (ptr_bar) { @@ -530,9 +472,7 @@ command_buffer_display_localvar (void *data, * command_buffer: manage buffers */ -int -command_buffer (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(buffer) { struct t_gui_buffer *ptr_buffer; long number, number1, number2; @@ -621,16 +561,7 @@ command_buffer (void *data, struct t_gui_buffer *buffer, /* move buffer to another number in the list */ if (string_strcasecmp (argv[1], "move") == 0) { - if (argc < 3) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "buffer"); - return WEECHAT_RC_ERROR; - } - + COMMAND_MIN_ARGS(3, "buffer move"); error = NULL; number = strtol (((argv[2][0] == '+') || (argv[2][0] == '-')) ? argv[2] + 1 : argv[2], @@ -661,16 +592,7 @@ command_buffer (void *data, struct t_gui_buffer *buffer, /* merge buffer with another number in the list */ if (string_strcasecmp (argv[1], "merge") == 0) { - if (argc < 3) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "buffer"); - return WEECHAT_RC_ERROR; - } - + COMMAND_MIN_ARGS(3, "buffer merge"); error = NULL; number = strtol (argv[2], &error, 10); if (error && !error[0]) @@ -718,7 +640,7 @@ command_buffer (void *data, struct t_gui_buffer *buffer, { if (argc < 3) { - if (!buffer->plugin) + if (buffer == gui_buffer_search_main ()) { gui_chat_printf (NULL, _("%sError: WeeChat main buffer can't be " @@ -797,20 +719,11 @@ command_buffer (void *data, struct t_gui_buffer *buffer, return WEECHAT_RC_OK; } - - /* display buffer notify */ + + /* set notify level */ if (string_strcasecmp (argv[1], "notify") == 0) { - if (argc < 3) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "buffer"); - return WEECHAT_RC_ERROR; - } - /* set notify level for current buffer */ + COMMAND_MIN_ARGS(3, "buffer notify"); config_weechat_notify_set (gui_current_window->buffer, argv_eol[2]); return WEECHAT_RC_OK; @@ -839,15 +752,7 @@ command_buffer (void *data, struct t_gui_buffer *buffer, /* set a property on buffer */ if (string_strcasecmp (argv[1], "set") == 0) { - if (argc < 4) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "buffer"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(4, "buffer set"); value = string_remove_quotes (argv_eol[3], "'\""); gui_buffer_set (buffer, argv[2], (value) ? value : argv_eol[3]); if (value) @@ -859,15 +764,7 @@ command_buffer (void *data, struct t_gui_buffer *buffer, /* get a buffer property */ if (string_strcasecmp (argv[1], "get") == 0) { - if (argc < 3) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "buffer"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(3, "buffer get"); if (gui_buffer_property_in_list (gui_buffer_properties_get_integer, argv[2])) { @@ -986,12 +883,159 @@ command_buffer (void *data, struct t_gui_buffer *buffer, } /* + * command_color: define custom colors and display palette of colors + */ + +COMMAND_CALLBACK(color) +{ + char *str_alias, *str_pair, *str_rgb, *pos, *error; + char str_color[1024], str_command[1024]; + long number; + int i; + struct t_gui_color_palette *color_palette; + + /* make C compiler happy */ + (void) data; + (void) argv_eol; + + if (argc == 1) + { + gui_color_buffer_open (); + return WEECHAT_RC_OK; + } + + /* add a color pair */ + if (string_strcasecmp (argv[1], "add") == 0) + { + COMMAND_MIN_ARGS(3, "color add"); + + /* check pair number */ + error = NULL; + number = strtol (argv[2], &error, 10); + if (error && !error[0]) + { + if ((number < 1) || (number > gui_color_get_last_pair ())) + number = -1; + } + else + { + number = -1; + } + if (number < 0) + { + gui_chat_printf (NULL, + _("%sInvalid pair number \"%s\" (must be between " + "%d and %d)"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + argv[2], 1, gui_color_get_last_pair ()); + return WEECHAT_RC_ERROR; + } + + /* check other arguments */ + str_alias = NULL; + str_pair = NULL; + str_rgb = NULL; + for (i = 3; i < argc; i++) + { + pos = strchr (argv[i], ','); + if (pos) + str_pair = argv[i]; + else + { + pos = strchr (argv[i], '/'); + if (pos) + str_rgb = argv[i]; + else + str_alias = argv[i]; + } + } + str_color[0] = '\0'; + if (str_alias) + { + strcat (str_color, ";"); + strcat (str_color, str_alias); + } + if (str_pair) + { + strcat (str_color, ";"); + strcat (str_color, str_pair); + } + if (str_rgb) + { + strcat (str_color, ";"); + strcat (str_color, str_rgb); + } + + /* add color pair */ + snprintf (str_command, sizeof (str_command), + "/set weechat.palette.%d \"%s\"", + (int)number, + (str_color[0]) ? str_color + 1 : ""); + input_exec_command (buffer, 1, NULL, str_command); + return WEECHAT_RC_OK; + } + + /* delete a color pair */ + if (string_strcasecmp (argv[1], "del") == 0) + { + COMMAND_MIN_ARGS(3, "color del"); + + /* check pair number */ + error = NULL; + number = strtol (argv[2], &error, 10); + if (error && !error[0]) + { + if ((number < 1) || (number > gui_color_get_last_pair ())) + number = -1; + } + else + { + number = -1; + } + if (number < 0) + { + gui_chat_printf (NULL, + _("%sInvalid pair number \"%s\" (must be between " + "%d and %d)"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + argv[2], 1, gui_color_get_last_pair ()); + return WEECHAT_RC_ERROR; + } + + /* search color pair */ + color_palette = gui_color_palette_get ((int)number); + if (!color_palette) + { + gui_chat_printf (NULL, + _("%sColor \"%s\" is not defined in palette"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + argv[2]); + return WEECHAT_RC_ERROR; + } + + /* delete color pair */ + snprintf (str_command, sizeof (str_command), + "/unset weechat.palette.%d", + (int)number); + input_exec_command (buffer, 1, NULL, str_command); + return WEECHAT_RC_OK; + } + + /* switch WeeChat/terminal colors */ + if (string_strcasecmp (argv[1], "switch") == 0) + { + gui_color_switch_colors (); + return WEECHAT_RC_OK; + } + + return WEECHAT_RC_OK; +} + +/* * command_command: launch explicit WeeChat or plugin command */ -int -command_command (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(command) { int length; char *command; @@ -1038,9 +1082,7 @@ command_command (void *data, struct t_gui_buffer *buffer, * command_debug: control debug for core/plugins */ -int -command_debug (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(debug) { struct t_config_option *ptr_option; struct t_weechat_plugin *ptr_plugin; @@ -1097,15 +1139,7 @@ command_debug (void *data, struct t_gui_buffer *buffer, } else if (string_strcasecmp (argv[1], "set") == 0) { - if (argc < 4) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "debug set"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(4, "debug set"); if (strcmp (argv[3], "0") == 0) { /* disable debug for a plugin */ @@ -1167,9 +1201,7 @@ command_filter_display (struct t_gui_filter *filter) * command_filter: manage message filters */ -int -command_filter (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(filter) { struct t_gui_filter *ptr_filter; @@ -1321,15 +1353,7 @@ command_filter (void *data, struct t_gui_buffer *buffer, /* add filter */ if (string_strcasecmp (argv[1], "add") == 0) { - if (argc < 6) - { - gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "filter add"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(6, "filter add"); if (gui_filter_search_by_name (argv[2])) { gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER, @@ -1370,17 +1394,7 @@ command_filter (void *data, struct t_gui_buffer *buffer, /* rename a filter */ if (string_strcasecmp (argv[1], "rename") == 0) { - if (argc < 4) - { - gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "filter rename"); - return WEECHAT_RC_ERROR; - } - - /* rename filter */ + COMMAND_MIN_ARGS(4, "filter rename"); ptr_filter = gui_filter_search_by_name (argv[2]); if (ptr_filter) { @@ -1415,15 +1429,7 @@ command_filter (void *data, struct t_gui_buffer *buffer, /* delete filter */ if (string_strcasecmp (argv[1], "del") == 0) { - if (argc < 3) - { - gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "filter del"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(3, "filter del"); if (string_strcasecmp (argv[2], "-all") == 0) { if (gui_filters) @@ -1473,9 +1479,7 @@ command_filter (void *data, struct t_gui_buffer *buffer, * command_help: display help about commands */ -int -command_help (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(help) { struct t_hook *ptr_hook; struct t_config_option *ptr_option; @@ -1840,9 +1844,7 @@ command_help (void *data, struct t_gui_buffer *buffer, * command_history: display current buffer history */ -int -command_history (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(history) { struct t_gui_history *ptr_history; int n, n_total, n_user, displayed; @@ -1897,9 +1899,7 @@ command_history (void *data, struct t_gui_buffer *buffer, * command_input: input actions (used by key bindings) */ -int -command_input (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(input) { /* make C compiler happy */ (void) data; @@ -2143,9 +2143,7 @@ command_key_display_listdiff () * command_key: bind/unbind keys */ -int -command_key (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(key) { char *internal_code; struct t_gui_key *ptr_key, *ptr_default_key, *ptr_new_key; @@ -2207,15 +2205,7 @@ command_key (void *data, struct t_gui_buffer *buffer, return WEECHAT_RC_OK; } - if (argc < 4) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "key"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(4, "key bind"); /* bind new key */ gui_keyboard_verbose = 1; @@ -2447,9 +2437,7 @@ command_layout_display_tree (struct t_gui_layout_window *layout_window, * command_layout: save/apply buffers/windows layout */ -int -command_layout (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(layout) { struct t_gui_layout_buffer *ptr_layout_buffer; int flag_buffers, flag_windows; @@ -2559,9 +2547,7 @@ command_layout (void *data, struct t_gui_buffer *buffer, * command_mute: execute a command mute */ -int -command_mute (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(mute) { int length, mute_mode; char *command, *ptr_command; @@ -2926,9 +2912,7 @@ command_plugin_list (const char *name, int full) * command_plugin: list/load/unload WeeChat plugins */ -int -command_plugin (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(plugin) { /* make C compiler happy */ (void) data; @@ -3029,9 +3013,7 @@ command_proxy_list () * command_proxy: manage proxies */ -int -command_proxy (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(proxy) { int type; char *error; @@ -3052,15 +3034,7 @@ command_proxy (void *data, struct t_gui_buffer *buffer, /* add a new proxy */ if (string_strcasecmp (argv[1], "add") == 0) { - if (argc < 6) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "proxy"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(6, "proxy add"); type = proxy_search_type (argv[3]); if (type < 0) { @@ -3107,15 +3081,7 @@ command_proxy (void *data, struct t_gui_buffer *buffer, /* delete a proxy */ if (string_strcasecmp (argv[1], "del") == 0) { - if (argc < 3) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "proxy"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(3, "proxy del"); if (string_strcasecmp (argv[2], "-all") == 0) { proxy_free_all (); @@ -3142,15 +3108,7 @@ command_proxy (void *data, struct t_gui_buffer *buffer, /* set a proxy property */ if (string_strcasecmp (argv[1], "set") == 0) { - if (argc < 5) - { - gui_chat_printf (NULL, - _("%sError: missing arguments for \"%s\" " - "command"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], - "proxy"); - return WEECHAT_RC_ERROR; - } + COMMAND_MIN_ARGS(5, "proxy set"); ptr_proxy = proxy_search (argv[2]); if (!ptr_proxy) { @@ -3185,9 +3143,7 @@ command_proxy (void *data, struct t_gui_buffer *buffer, * command_quit: quit WeeChat */ -int -command_quit (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(quit) { int confirm_ok; char *pos_args; @@ -3266,9 +3222,7 @@ command_reload_file (struct t_config_file *config_file) * command_reload: reload WeeChat and plugins options from disk */ -int -command_reload (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(reload) { struct t_config_file *ptr_config_file; int i; @@ -3333,9 +3287,7 @@ command_save_file (struct t_config_file *config_file) * command_save: save configuration files to disk */ -int -command_save (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(save) { struct t_config_file *ptr_config_file; int i; @@ -3548,13 +3500,11 @@ command_set_display_option_list (const char *message, const char *search) * command_set: set config options */ -int -command_set (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(set) { char *value; int number_found, rc; - struct t_config_option *ptr_option; + struct t_config_option *ptr_option, *ptr_option_before; /* make C compiler happy */ (void) data; @@ -3572,20 +3522,25 @@ command_set (void *data, struct t_gui_buffer *buffer, if (number_found == 0) { if (argc == 2) + { gui_chat_printf (NULL, _("%sOption \"%s\" not found (tip: you can use " "\"*\" at beginning and/or end of option to " "see a sublist)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[1]); + } else + { gui_chat_printf (NULL, _("No configuration option found")); + } } else { gui_chat_printf (NULL, ""); if (argc == 2) + { gui_chat_printf (NULL, NG_("%s%d%s configuration option found " "matching with \"%s\"", @@ -3596,7 +3551,9 @@ command_set (void *data, struct t_gui_buffer *buffer, number_found, GUI_COLOR(GUI_COLOR_CHAT), argv[1]); + } else + { gui_chat_printf (NULL, NG_("%s%d%s configuration option found", "%s%d%s configuration options found", @@ -3604,12 +3561,15 @@ command_set (void *data, struct t_gui_buffer *buffer, GUI_COLOR(GUI_COLOR_CHAT_BUFFER), number_found, GUI_COLOR(GUI_COLOR_CHAT)); + } } return WEECHAT_RC_OK; } /* set option value */ - value =(string_strcasecmp (argv_eol[2], WEECHAT_CONFIG_OPTION_NULL) == 0) ? + config_file_search_with_string (argv[1], NULL, NULL, &ptr_option_before, + NULL); + value = (string_strcasecmp (argv_eol[2], WEECHAT_CONFIG_OPTION_NULL) == 0) ? NULL : string_remove_quotes (argv_eol[2], "'\""); rc = config_file_option_set_with_string (argv[1], value); if (value) @@ -3633,8 +3593,12 @@ command_set (void *data, struct t_gui_buffer *buffer, config_file_search_with_string (argv[1], NULL, NULL, &ptr_option, NULL); if (ptr_option) + { command_set_display_option (ptr_option, - _("Option changed: ")); + (ptr_option_before) ? + _("Option changed: ") : + _("Option created: ")); + } else gui_chat_printf (NULL, _("Option changed")); break; @@ -3647,9 +3611,7 @@ command_set (void *data, struct t_gui_buffer *buffer, * command_unset: unset/reset config options */ -int -command_unset (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(unset) { struct t_config_file *ptr_config; struct t_config_section *ptr_section; @@ -3733,9 +3695,7 @@ command_unset (void *data, struct t_gui_buffer *buffer, * command_upgrade: upgrade WeeChat */ -int -command_upgrade (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(upgrade) { char *ptr_binary; char *exec_args[7] = { NULL, "-a", "--dir", NULL, "--upgrade", NULL }; @@ -3853,9 +3813,7 @@ command_upgrade (void *data, struct t_gui_buffer *buffer, * command_uptime: display WeeChat uptime */ -int -command_uptime (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(uptime) { time_t running_time; int day, hour, min, sec; @@ -4005,9 +3963,7 @@ command_version_display (struct t_gui_buffer *buffer, * command_version: display WeeChat version */ -int -command_version (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(version) { int send_to_buffer_as_input, translated_string; @@ -4080,9 +4036,7 @@ command_wait_timer_cb (void *data, int remaining_calls) * command_wait: schedule a command execution in future */ -int -command_wait (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(wait) { char *pos, *str_number, *error; long number, factor, delay; @@ -4159,9 +4113,7 @@ command_wait (void *data, struct t_gui_buffer *buffer, * command_window: manage windows */ -int -command_window (void *data, struct t_gui_buffer *buffer, - int argc, char **argv, char **argv_eol) +COMMAND_CALLBACK(window) { struct t_gui_window *ptr_win; int i; @@ -4570,6 +4522,29 @@ command_init () " || %(irc_privates)" " || %(buffers_numbers)", &command_buffer, NULL); + hook_command (NULL, "color", + N_("define custom colors and display palette of colors"), + N_("[add pair [alias] [fg,bg]] | [del pair] | switch"), + N_(" add: add a color pair\n" + " del: delete a color pair\n" + "switch: switch WeeChat/terminal colors\n" + " pair: pair number (>= 1)\n" + " alias: alias name for color (for example: \"orange\")\n" + " fg,bg: foreground and background pair number (-1 for " + "default terminal foreground or background)\n\n" + "Without argument, this command displays colors in a new " + "buffer.\n\n" + "Examples:\n" + " add color 214 with alias \"orange\":\n" + " /color add 214 orange\n" + " add color 250 with orange on blue:\n" + " /color add 250 214,4 orange_blue\n" + " delete color 214:\n" + " /color del 214"), + "add %(color_pairs)" + " || del %(color_pairs)" + " || switch", + &command_color, NULL); hook_command (NULL, "command", N_("launch explicit WeeChat or plugin command"), N_("plugin command"), diff --git a/src/core/wee-command.h b/src/core/wee-command.h index b6487b7bc..adcc5b537 100644 --- a/src/core/wee-command.h +++ b/src/core/wee-command.h @@ -21,6 +21,11 @@ #ifndef __WEECHAT_COMMAND_H #define __WEECHAT_COMMAND_H 1 +#define COMMAND_CALLBACK(__command) \ + int \ + command_##__command (void *data, struct t_gui_buffer *buffer, \ + int argc, char **argv, char **argv_eol) + /* * This macro is used to create an "empty" command in WeeChat core: * command does nothing, but plugins or scripts can catch it when it @@ -40,6 +45,18 @@ return WEECHAT_RC_OK; \ } +#define COMMAND_MIN_ARGS(__min, __command) \ + if (argc < __min) \ + { \ + gui_chat_printf_date_tags ( \ + NULL, 0, \ + GUI_FILTER_TAG_NO_FILTER, \ + _("%sError: missing arguments for \"%s\" command"), \ + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], \ + __command); \ + return WEECHAT_RC_ERROR; \ + } + struct t_gui_buffer; extern int command_reload (void *data, struct t_gui_buffer *buffer, diff --git a/src/core/wee-completion.c b/src/core/wee-completion.c index eb2749472..22f924ef4 100644 --- a/src/core/wee-completion.c +++ b/src/core/wee-completion.c @@ -261,6 +261,46 @@ completion_list_add_buffer_properties_get_cb (void *data, } /* + * completion_list_map_add_color_cb: add color pairs in completion + */ + +void +completion_list_map_add_color_cb (void *data, + struct t_hashtable *hashtable, + const void *key, const void *value) +{ + /* make C compiler happy */ + (void) hashtable; + (void) value; + + gui_completion_list_add ((struct t_gui_completion *)data, + (char *)key, + 0, WEECHAT_LIST_POS_SORT); +} + +/* + * completion_list_add_color_pairs_cb: add color pairs (in section "palette") + */ + +int +completion_list_add_color_pairs_cb (void *data, + const char *completion_item, + struct t_gui_buffer *buffer, + struct t_gui_completion *completion) +{ + /* make C compiler happy */ + (void) data; + (void) completion_item; + (void) buffer; + + hashtable_map (gui_color_hash_palette_color, + &completion_list_map_add_color_cb, + completion); + + return WEECHAT_RC_OK; +} + +/* * completion_list_add_config_files_cb: add config files to completion list */ @@ -707,13 +747,13 @@ completion_list_add_plugins_commands_cb (void *data, } /* - * completion_list_add_color_alias_cb: add color alias in completion + * completion_list_map_add_color_alias_cb: add color alias in completion */ void -completion_list_add_color_alias_cb (void *data, - struct t_hashtable *hashtable, - const void *key, const void *value) +completion_list_map_add_color_alias_cb (void *data, + struct t_hashtable *hashtable, + const void *key, const void *value) { /* make C compiler happy */ (void) hashtable; @@ -898,7 +938,7 @@ completion_list_add_config_option_values_cb (void *data, } break; case CONFIG_OPTION_TYPE_COLOR: - num_colors = gui_color_get_number (); + num_colors = gui_color_get_weechat_colors_number (); for (i = 0; i < num_colors; i++) { color_name = gui_color_get_name (i); @@ -910,7 +950,7 @@ completion_list_add_config_option_values_cb (void *data, if (gui_color_hash_palette_alias) { hashtable_map (gui_color_hash_palette_alias, - &completion_list_add_color_alias_cb, + &completion_list_map_add_color_alias_cb, completion); } gui_completion_list_add (completion, "++1", @@ -1155,6 +1195,9 @@ completion_init () hook_completion (NULL, "buffer_properties_get", N_("properties that can be read on a buffer"), &completion_list_add_buffer_properties_get_cb, NULL); + hook_completion (NULL, "color_pairs", + N_("color pairs"), + &completion_list_add_color_pairs_cb, NULL); hook_completion (NULL, "config_files", /* formerly "%c" */ N_("configuration files"), &completion_list_add_config_files_cb, NULL); diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c index 651a1752a..7fc1458e5 100644 --- a/src/core/wee-config-file.c +++ b/src/core/wee-config-file.c @@ -636,7 +636,7 @@ config_file_new_option (struct t_config_file *config_file, break; case CONFIG_OPTION_TYPE_COLOR: new_option->min = min; - new_option->max = gui_color_get_number () - 1; + new_option->max = gui_color_get_weechat_colors_number () - 1; if (default_value) { new_option->default_value = malloc (sizeof (int)); @@ -1251,7 +1251,7 @@ config_file_option_set (struct t_config_option *option, const char *value, old_value = CONFIG_COLOR(option); if (option->value) { - num_colors = gui_color_get_number (); + num_colors = gui_color_get_weechat_colors_number (); value_int = -1; new_value_ok = 0; if (strncmp (value, "++", 2) == 0) diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 51c57fbcf..cd181be5f 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -407,6 +407,20 @@ config_change_color (void *data, struct t_config_option *option) } /* + * config_change_nick_colors: called when nick colors are changed + */ + +void +config_change_nick_colors (void *data, struct t_config_option *option) +{ + /* make C compiler happy */ + (void) data; + (void) option; + + gui_color_buffer_display (); +} + +/* * config_day_change_timer_cb: timer callback for displaying * "Day changed to xxx" message */ @@ -728,10 +742,9 @@ config_weechat_palette_create_option_cb (void *data, ptr_option = config_file_new_option ( config_file, section, option_name, "string", - _("custom color in palette, format is: \"alias;fg,bg;r/g/b\" " + _("custom color in palette, format is: \"alias;fg,bg\" " "where alias is color name, fg,bg is \"foreground,background\" " - "(example: \"200,-1\"), r/g/b is redefinition of color " - "(terminal must support it) (everything is optional " + "(example: \"200,-1\") (everything is optional " "in this format and order is not important)"), NULL, 0, 0, "", value, 0, NULL, NULL, &config_weechat_palette_change_cb, NULL, @@ -762,9 +775,9 @@ config_weechat_palette_create_option_cb (void *data, int config_weechat_palette_delete_option_cb (void *data, - struct t_config_file *config_file, - struct t_config_section *section, - struct t_config_option *option) + struct t_config_file *config_file, + struct t_config_section *section, + struct t_config_option *option) { char *error; int number; @@ -1869,7 +1882,7 @@ config_weechat_init_options () N_("text color for nicks (comma separated list of colors)"), NULL, 0, 0, "cyan,magenta,green,brown,lightblue,default,lightcyan," "lightmagenta,lightgreen,blue", NULL, 0, - NULL, NULL, NULL, NULL, NULL, NULL); + NULL, NULL, &config_change_nick_colors, NULL, NULL, NULL); config_color_chat_nick_self = config_file_new_option ( weechat_config_file, ptr_section, "chat_nick_self", "color", diff --git a/src/core/wee-upgrade.c b/src/core/wee-upgrade.c index c786c66f3..4eeb0091b 100644 --- a/src/core/wee-upgrade.c +++ b/src/core/wee-upgrade.c @@ -39,6 +39,7 @@ #include "wee-util.h" #include "../gui/gui-buffer.h" #include "../gui/gui-chat.h" +#include "../gui/gui-color.h" #include "../gui/gui-history.h" #include "../gui/gui-hotlist.h" #include "../gui/gui-line.h" @@ -328,11 +329,11 @@ upgrade_weechat_read_cb (void *data, } break; case UPGRADE_WEECHAT_TYPE_BUFFER: - if (!infolist_string (infolist, "plugin_name") - || (strcmp (infolist_string (infolist, "plugin_name"), - plugin_get_name (NULL)) == 0)) + plugin_name = infolist_string (infolist, "plugin_name"); + name = infolist_string (infolist, "name"); + if (gui_buffer_is_main (plugin_name, name)) { - /* use WeeChat main buffer (plugin is "core") */ + /* use WeeChat main buffer */ upgrade_current_buffer = gui_buffers; } else @@ -608,6 +609,9 @@ upgrade_weechat_load () upgrade_set_current_buffer, 0); } + gui_color_buffer_assign (); + gui_color_buffer_display (); + return rc; } diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c index 54a367b18..aaf7dc755 100644 --- a/src/gui/curses/gui-curses-color.c +++ b/src/gui/curses/gui-curses-color.c @@ -36,8 +36,10 @@ #include "../../core/wee-string.h" #include "../../core/wee-utf8.h" #include "../../plugins/plugin.h" +#include "../gui-buffer.h" #include "../gui-color.h" #include "../gui-chat.h" +#include "../gui-window.h" #include "gui-curses.h" @@ -63,6 +65,8 @@ struct t_gui_color gui_weechat_colors[GUI_CURSES_NUM_WEECHAT_COLORS + 1] = int gui_color_last_pair = 63; int gui_color_num_bg = 8; +struct t_gui_buffer *gui_color_buffer = NULL; +int gui_color_terminal_colors = 0; /* @@ -180,16 +184,26 @@ gui_color_assign_by_diff (int *color, const char *color_name, int diff) } /* - * gui_color_get_number: get number of available colors + * gui_color_get_weechat_colors_number: get number of WeeChat colors */ int -gui_color_get_number () +gui_color_get_weechat_colors_number () { return GUI_CURSES_NUM_WEECHAT_COLORS; } /* + * gui_color_get_last_pair: get last pair number + */ + +int +gui_color_get_last_pair () +{ + return gui_color_last_pair; +} + +/* * gui_color_get_name: get color name */ @@ -299,20 +313,27 @@ gui_color_init_pair (int number) struct t_gui_color_palette *ptr_color_palette; int fg, bg; - if ((number >= 1) && (number <= COLOR_PAIRS - 1)) + if ((number >= 1) && (number <= gui_color_last_pair)) { - ptr_color_palette = gui_color_palette_get (number); - if (ptr_color_palette) + if (gui_color_terminal_colors) { - init_pair (number, - ptr_color_palette->foreground, - ptr_color_palette->background); + init_pair (number, number, -1); } else { - fg = (number - 1) % gui_color_num_bg; - bg = ((number - 1) < gui_color_num_bg) ? -1 : (number - 1) / gui_color_num_bg; - init_pair (number, fg, bg); + ptr_color_palette = gui_color_palette_get (number); + if (ptr_color_palette) + { + init_pair (number, + ptr_color_palette->foreground, + ptr_color_palette->background); + } + else + { + fg = (number - 1) % gui_color_num_bg; + bg = ((number - 1) < gui_color_num_bg) ? -1 : (number - 1) / gui_color_num_bg; + init_pair (number, fg, bg); + } } } } @@ -350,20 +371,23 @@ gui_color_init_pairs () gui_color_init_pair (i); } - /* disable white on white, replaced by black on white */ - ptr_color_palette = gui_color_palette_get (gui_color_last_pair); - if (!ptr_color_palette) - init_pair (gui_color_last_pair, -1, -1); - - /* - * white on default bg is default (-1) (for terminals with white/light - * background) - */ - if (!CONFIG_BOOLEAN(config_look_color_real_white)) + if (!gui_color_terminal_colors) { - ptr_color_palette = gui_color_palette_get (COLOR_WHITE); + /* disable white on white, replaced by black on white */ + ptr_color_palette = gui_color_palette_get (gui_color_last_pair); if (!ptr_color_palette) - init_pair (COLOR_WHITE + 1, -1, -1); + init_pair (gui_color_last_pair, -1, -1); + + /* + * white on default bg is default (-1) (for terminals with white/light + * background) + */ + if (!CONFIG_BOOLEAN(config_look_color_real_white)) + { + ptr_color_palette = gui_color_palette_get (COLOR_WHITE); + if (!ptr_color_palette) + init_pair (COLOR_WHITE + 1, -1, -1); + } } } } @@ -461,10 +485,9 @@ void gui_color_display_terminal_colors () { int lines, line, col, color; - int color_support, colors, color_pairs, change_color; + int colors, color_pairs, change_color; char str_line[1024], str_color[64]; - - color_support = 0; + colors = 0; color_pairs = 0; change_color = 0; @@ -472,7 +495,6 @@ gui_color_display_terminal_colors () initscr (); if (has_colors ()) { - color_support = 1; start_color (); use_default_colors (); colors = COLORS; @@ -482,7 +504,7 @@ gui_color_display_terminal_colors () endwin (); } printf ("\n"); - printf ("%s $TERM=%s COLORS: %d, COLOR_PAIRS: %d, " + printf ("%s $TERM=%s COLORS: %d, COLOR_PAIRS: %d, " "can_change_color: %s\n", _("Terminal infos:"), getenv ("TERM"), colors, color_pairs, @@ -521,6 +543,311 @@ gui_color_display_terminal_colors () } /* + * gui_color_buffer_display: display content of color buffer + */ + +void +gui_color_buffer_display () +{ + int y, i, lines, line, col, color; + int colors, color_pairs, change_color, num_items; + char str_line[1024], str_color[64], str_rgb[64], **items; + struct t_gui_color_palette *color_palette; + + if (!gui_color_buffer) + return; + + gui_buffer_clear (gui_color_buffer); + + colors = 0; + color_pairs = 0; + change_color = 0; + + if (has_colors ()) + { + colors = COLORS; + color_pairs = COLOR_PAIRS; + change_color = can_change_color () ? 1 : 0; + } + + /* set title buffer */ + gui_buffer_set_title (gui_color_buffer, + _("WeeChat colors | Actions: [R] Refresh " + "[Q] Close buffer | Keys: [alt-c] Toggle colors")); + + /* display terminal/colors infos */ + y = 0; + gui_chat_printf_y (gui_color_buffer, y++, + "$TERM=%s COLORS: %d, COLOR_PAIRS: %d, " + "can_change_color: %s", + getenv ("TERM"), + colors, + color_pairs, + (change_color) ? "yes" : "no"); + + /* display palette of colors */ + y++; + gui_chat_printf_y (gui_color_buffer, y++, + (gui_color_terminal_colors) ? + _("Terminal colors:") : + _("WeeChat colors:")); + gui_chat_printf_y (gui_color_buffer, y++, + " %s%s00000 000 %s%s", + GUI_COLOR_COLOR_STR, + GUI_COLOR_PAIR_STR, + GUI_COLOR(GUI_COLOR_CHAT), + _("fixed color")); + lines = (colors < 16) ? colors : 16; + for (line = 0; line < lines; line++) + { + str_line[0] = '\0'; + for (col = 0; col < 16; col++) + { + color = (col * 16) + line + 1; + if (color < colors) + { + snprintf (str_color, sizeof (str_color), + "%s%s%05d %03d ", + GUI_COLOR_COLOR_STR, + GUI_COLOR_PAIR_STR, + color, + color); + strcat (str_line, str_color); + } + else + { + snprintf (str_color, sizeof (str_color), + "%s ", + GUI_COLOR(GUI_COLOR_CHAT)); + strcat (str_line, str_color); + } + } + gui_chat_printf_y (gui_color_buffer, y++, + " %s", + str_line); + } + + /* display WeeChat basic colors */ + y++; + gui_chat_printf_y (gui_color_buffer, y++, + _("WeeChat basic colors:")); + str_line[0] = '\0'; + for (i = 0; i < GUI_CURSES_NUM_WEECHAT_COLORS; i++) + { + if (gui_color_terminal_colors) + { + snprintf (str_color, sizeof (str_color), + " %s", + gui_weechat_colors[i].string); + } + else + { + snprintf (str_color, sizeof (str_color), + "%s%s%02d %s", + GUI_COLOR_COLOR_STR, + GUI_COLOR_FG_STR, + i, + gui_weechat_colors[i].string); + } + strcat (str_line, str_color); + if (((i + 1) % 8) == 0) + { + gui_chat_printf_y (gui_color_buffer, y++, + " %s", str_line); + str_line[0] = '\0'; + } + } + if (str_line[0]) + { + gui_chat_printf_y (gui_color_buffer, y++, + " %s", str_line); + } + + /* display nick colors */ + y++; + gui_chat_printf_y (gui_color_buffer, y++, + _("Nick colors:")); + items = string_split (CONFIG_STRING(config_color_chat_nick_colors), + ",", 0, 0, &num_items); + if (items) + { + str_line[0] = '\0'; + for (i = 0; i < num_items; i++) + { + if (gui_color_terminal_colors) + { + snprintf (str_color, sizeof (str_color), + " %s", + items[i]); + } + else + { + snprintf (str_color, sizeof (str_color), + "%s %s", + gui_color_get_custom (items[i]), + items[i]); + } + strcat (str_line, str_color); + if (((i + 1) % 8) == 0) + { + gui_chat_printf_y (gui_color_buffer, y++, + " %s", str_line); + str_line[0] = '\0'; + } + } + if (str_line[0]) + { + gui_chat_printf_y (gui_color_buffer, y++, + " %s", str_line); + } + string_free_split (items); + } + + /* display palette colors */ + if (hashtable_get_integer (gui_color_hash_palette_color, + "items_count") > 0) + { + y++; + gui_chat_printf_y (gui_color_buffer, y++, + _("Palette colors:")); + for (i = 1; i <= gui_color_last_pair; i++) + { + color_palette = gui_color_palette_get (i); + if (color_palette) + { + str_color[0] = '\0'; + if (!gui_color_terminal_colors) + { + snprintf (str_color, sizeof (str_color), + "%s%s%05d", + GUI_COLOR_COLOR_STR, + GUI_COLOR_PAIR_STR, + i); + } + snprintf (str_rgb, sizeof (str_rgb), " "); + if ((color_palette->r >= 0) && (color_palette->g >= 0) + && (color_palette->b >= 0)) + { + snprintf (str_rgb, sizeof (str_rgb), + "%04d/%04d/%04d", + color_palette->r, + color_palette->g, + color_palette->b); + } + gui_chat_printf_y (gui_color_buffer, y++, + " %5d: %s%5d,%-5d %s %s", + i, + str_color, + color_palette->foreground, + color_palette->background, + str_rgb, + (color_palette->alias) ? + color_palette->alias : ""); + } + } + } +} + +/* + * gui_color_switch_colrs: switch between WeeChat and terminal colors + */ + +void +gui_color_switch_colors () +{ + gui_color_terminal_colors ^= 1; + gui_color_init_pairs (); + gui_color_buffer_display (); +} + +/* + * gui_color_buffer_input_cb: input callback for color buffer + */ + +int +gui_color_buffer_input_cb (void *data, struct t_gui_buffer *buffer, + const char *input_data) +{ + /* make C compiler happy */ + (void) data; + + if (string_strcasecmp (input_data, "r") == 0) + { + gui_color_buffer_display (); + } + else if (string_strcasecmp (input_data, "q") == 0) + { + gui_buffer_close (buffer); + } + + return WEECHAT_RC_OK; +} + +/* + * gui_color_buffer_close_cb: close callback for color buffer + */ + +int +gui_color_buffer_close_cb (void *data, struct t_gui_buffer *buffer) +{ + /* make C compiler happy */ + (void) data; + (void) buffer; + + gui_color_buffer = NULL; + + return WEECHAT_RC_OK; +} + +/* + * gui_color_buffer_assign: assign color buffer to pointer if it is not yet set + */ + +void +gui_color_buffer_assign () +{ + if (!gui_color_buffer) + { + gui_color_buffer = gui_buffer_search_by_name (NULL, "color"); + if (gui_color_buffer) + { + gui_color_buffer->input_callback = &gui_color_buffer_input_cb; + gui_color_buffer->close_callback = &gui_color_buffer_close_cb; + } + } +} + +/* + * gui_color_buffer_open: open a buffer to display colors + */ + +void +gui_color_buffer_open () +{ + if (!gui_color_buffer) + { + gui_color_buffer = gui_buffer_new (NULL, "color", + &gui_color_buffer_input_cb, NULL, + &gui_color_buffer_close_cb, NULL); + if (gui_color_buffer) + { + gui_buffer_set (gui_color_buffer, "type", "free"); + gui_buffer_set (gui_color_buffer, "localvar_set_no_log", "1"); + gui_buffer_set (gui_color_buffer, "key_bind_meta-c", "/color switch"); + } + } + + gui_color_buffer_display (); + + if (!gui_color_buffer) + return; + + gui_window_switch_to_buffer (gui_current_window, gui_color_buffer, 1); + + gui_color_buffer_display (); +} + +/* * gui_color_palette_add_alias_cb: add an alias in hashtable with aliases */ @@ -633,11 +960,6 @@ gui_color_palette_new (int number, const char *value) { new_color_palette->alias = strdup (str_alias); } - else - { - snprintf (str_number, sizeof (str_number), "%d", number); - new_color_palette->alias = strdup (str_number); - } if (str_pair) { @@ -687,9 +1009,13 @@ gui_color_palette_new (int number, const char *value) } } } - string_free_split (items); } + if (!new_color_palette->alias) + { + snprintf (str_number, sizeof (str_number), "%d", number); + new_color_palette->alias = strdup (str_number); + } } return new_color_palette; diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c index 2ca5469e6..8ad5ba36b 100644 --- a/src/gui/curses/gui-curses-main.c +++ b/src/gui/curses/gui-curses-main.c @@ -120,7 +120,8 @@ gui_main_init () gui_init_ok = 0; /* create core buffer */ - ptr_buffer = gui_buffer_new (NULL, "weechat", NULL, NULL, NULL, NULL); + ptr_buffer = gui_buffer_new (NULL, GUI_BUFFER_MAIN, + NULL, NULL, NULL, NULL); if (ptr_buffer) { gui_init_ok = 1; diff --git a/src/gui/gtk/gui-gtk-color.c b/src/gui/gtk/gui-gtk-color.c index 96d20c4eb..68d0aacbe 100644 --- a/src/gui/gtk/gui-gtk-color.c +++ b/src/gui/gtk/gui-gtk-color.c @@ -122,11 +122,21 @@ gui_color_assign_by_diff (int *color, const char *color_name, int diff) } /* - * gui_color_get_number: get number of available colors + * gui_color_get_weechat_colors_number: get number of available colors */ int -gui_color_get_number () +gui_color_get_weechat_colors_number () +{ + return 0; +} + +/* + * gui_color_get_last_pair: get last pair number + */ + +int +gui_color_get_last_pair () { return 0; } @@ -259,6 +269,46 @@ gui_color_display_terminal_colors () } /* + * gui_color_buffer_display: display content of color buffer + */ + +void +gui_color_buffer_display () +{ + /* This function does nothing in Gtk GUI */ +} + +/* + * gui_color_switch_colrs: switch between WeeChat and terminal colors + */ + +void +gui_color_switch_colors () +{ + /* This function does nothing in Gtk GUI */ +} + +/* + * gui_color_buffer_assign: assign color buffer to pointer if it is not yet set + */ + +void +gui_color_buffer_assign () +{ + /* This function does nothing in Gtk GUI */ +} + +/* + * gui_color_buffer_open: open a buffer to display colors + */ + +void +gui_color_buffer_open () +{ + /* This function does nothing in Gtk GUI */ +} + +/* * gui_color_palette_build_aliases: build aliases for palette */ diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c index 1d326b874..f845104cb 100644 --- a/src/gui/gui-buffer.c +++ b/src/gui/gui-buffer.c @@ -1522,8 +1522,26 @@ gui_buffer_add_value_num_displayed (struct t_gui_buffer *buffer, int value) } /* + * gui_buffer_is_main: return 1 if plugin/name of buffer is WeeChat main buffer + */ + +int +gui_buffer_is_main (const char *plugin_name, const char *name) +{ + /* if plugin is set and is not "core", then it's NOT main buffer */ + if (plugin_name && (strcmp (plugin_name, plugin_get_name (NULL)) != 0)) + return 0; + + /* if name is set and is not "weechat", then it's NOT main buffer */ + if (name && (strcmp (name, GUI_BUFFER_MAIN) != 0)) + return 0; + + /* it's main buffer */ + return 1; +} + +/* * gui_buffer_search_main: get main buffer (weechat one, created at startup) - * return first buffer if not found */ struct t_gui_buffer * @@ -1534,7 +1552,9 @@ gui_buffer_search_main () for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) { - if (!ptr_buffer->plugin) + if ((!ptr_buffer->plugin) + && (ptr_buffer->name) + && (strcmp (ptr_buffer->name, GUI_BUFFER_MAIN) == 0)) return ptr_buffer; } diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h index 16cdf496c..6bedf6f0b 100644 --- a/src/gui/gui-buffer.h +++ b/src/gui/gui-buffer.h @@ -42,6 +42,8 @@ enum t_gui_buffer_notify GUI_BUFFER_NUM_NOTIFY, }; +#define GUI_BUFFER_MAIN "weechat" + #define GUI_TEXT_SEARCH_DISABLED 0 #define GUI_TEXT_SEARCH_BACKWARD 1 #define GUI_TEXT_SEARCH_FORWARD 2 @@ -244,6 +246,7 @@ extern void gui_buffer_set_pointer (struct t_gui_buffer *buffer, const char *property, void *pointer); extern void gui_buffer_add_value_num_displayed (struct t_gui_buffer *buffer, int value); +extern int gui_buffer_is_main (const char *plugin_name, const char *name); extern struct t_gui_buffer *gui_buffer_search_main (); extern struct t_gui_buffer *gui_buffer_search_by_name (const char *plugin, const char *name); diff --git a/src/gui/gui-color.c b/src/gui/gui-color.c index b875e4b68..03a6973ec 100644 --- a/src/gui/gui-color.c +++ b/src/gui/gui-color.c @@ -569,7 +569,10 @@ gui_color_palette_add (int number, const char *value) gui_color_palette_build_aliases (); if (gui_init_ok) + { gui_color_init_pair (number); + gui_color_buffer_display (); + } } /* @@ -593,7 +596,10 @@ gui_color_palette_remove (int number) hashtable_remove (gui_color_hash_palette_color, str_number); gui_color_palette_build_aliases (); if (gui_init_ok) + { gui_color_init_pair (number); + gui_color_buffer_display (); + } } } diff --git a/src/gui/gui-color.h b/src/gui/gui-color.h index 5d199a67f..62c810aca 100644 --- a/src/gui/gui-color.h +++ b/src/gui/gui-color.h @@ -166,12 +166,17 @@ extern int gui_color_search (const char *color_name); extern int gui_color_assign (int *color, char const *color_name); extern int gui_color_assign_by_diff (int *color, const char *color_name, int diff); -extern int gui_color_get_number (); +extern int gui_color_get_weechat_colors_number (); +extern int gui_color_get_last_pair (); extern const char *gui_color_get_name (int num_color); extern void gui_color_init_pair (int number); extern void gui_color_init_pairs (); extern void gui_color_init_weechat (); extern void gui_color_display_terminal_colors (); +extern void gui_color_buffer_display (); +extern void gui_color_switch_colors (); +extern void gui_color_buffer_assign (); +extern void gui_color_buffer_open (); extern void gui_color_palette_build_aliases (); extern struct t_gui_color_palette *gui_color_palette_new (int number, const char *value); |