diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 3aea72f06..a08ba27c9 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -19,6 +19,7 @@ New features:: * core: add variables "_chat_focused_line_bol" and "_chat_focused_line_eol" in focus data (issue #1955) * api: add info "buffer" (issue #1962) * buflist: increase max number of buflist items from 3 to 5 (issue #1703) + * fset: add variable `allowed_values` in options, add options fset.color.allowed_values and fset.color.allowed_values_selected * fset: allow long type name in type filter * irc: display commands 716/717 in private buffer (if present) (issue #146) * trigger: add options `-o`, `-ol`, `-i` and `-il` in command `/trigger list` (issue #1953) diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc index 5f2867c11..29b5b2e67 100644 --- a/ReleaseNotes.adoc +++ b/ReleaseNotes.adoc @@ -14,14 +14,26 @@ For a complete list of changes, please look at ChangeLog. [[v4.1.0]] == Version 4.1.0 (under dev) +[[v4.1.0_fset_allowed_values]] +=== Allowed values for options on fset buffer + +A new variable `allowed_values` has been added in fset options. + +The default value for the second format has changed. + +You can reset it with this command: + +---- +/reset fset.format.option2 +---- + [[v4.1.0_fset_mouse]] === Mouse actions on fset buffer Mouse actions on fset buffer has been fixed when option `fset.look.format_number` is set to 2. -The key for button 1 on fset buffer has been fixed and must be reset with this -command: +The key for button 1 on fset buffer has been fixed. + +You can reset it with this command: ---- /reset weechat.key_mouse.@chat(fset.fset):button1 diff --git a/po/cs.po b/po/cs.po index 16eed8ce9..525c24112 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -511,6 +511,7 @@ msgstr "celé číslo" msgid "string" msgstr "řetězec" +#, c-format msgid "any string" msgstr "jakýkoliv řetězec" @@ -6092,7 +6093,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -6128,6 +6130,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -6326,6 +6329,14 @@ msgid "" "ctrl-x" msgstr "" +#, fuzzy +msgid "color for allowed values" +msgstr "barva položek, které jsou pryč" + +#, fuzzy +msgid "color for allowed values on the selected line" +msgstr "barva položek, které jsou pryč" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" @@ -6380,10 +6391,6 @@ msgstr "barva přezdívky ve vstupním poli" msgid "color for quotes around string values" msgstr "barva textu vezprávách připojení" -#, fuzzy -msgid "color for allowed values" -msgstr "barva položek, které jsou pryč" - #, fuzzy msgid "color for index of option" msgstr "barva textu pro zvýrazněný prefix" @@ -6590,6 +6597,11 @@ msgstr "jméno serveru (zástupný znak \"*\" je povolen) (volitelný)" msgid "fset options" msgstr "seznam konfiguračních možností" +#, fuzzy, c-format +#| msgid "color" +msgid "any color" +msgstr "barva" + #, fuzzy, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "%s%s: server \"%s\" již existuje, nemohu jej vytvořít!" diff --git a/po/de.po b/po/de.po index 2f4e0f052..56557572d 100644 --- a/po/de.po +++ b/po/de.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2023-07-05 21:23+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -548,6 +548,7 @@ msgstr "integer" msgid "string" msgstr "Zeichenkette" +#, c-format msgid "any string" msgstr "beliebige Zeichenkette" @@ -7831,7 +7832,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -7867,6 +7869,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -8300,6 +8303,14 @@ msgstr "" "ohne eine Evaluierung statt, was wesentlich schneller ist; zwischen den " "Formaten kann mittels ctrl-x umgeschaltet werden" +msgid "color for allowed values" +msgstr "Farbe für erlaubte Werte" + +#, fuzzy +#| msgid "color for max value on the selected line" +msgid "color for allowed values on the selected line" +msgstr "Farbe für Maximalwert bei der ausgewählten Zeile" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" "Farbe für Farbnamen, wenn die Option fset.look.use_color_value aktiviert ist" @@ -8347,9 +8358,6 @@ msgstr "Farbe für Namen in Hilfe-Bar" msgid "color for quotes around string values" msgstr "Farbe der Anführungszeichen für Stringwerte" -msgid "color for allowed values" -msgstr "Farbe für erlaubte Werte" - msgid "color for index of option" msgstr "Farbe für Index einer Option" @@ -8542,6 +8550,11 @@ msgstr "" msgid "fset options" msgstr "fset Optionen" +#, fuzzy, c-format +#| msgid "color" +msgid "any color" +msgstr "Farbe" + #, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "" diff --git a/po/es.po b/po/es.po index ad02e1039..5ad674e02 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -566,6 +566,7 @@ msgstr "entero" msgid "string" msgstr "texto" +#, c-format msgid "any string" msgstr "cualquier texto" @@ -6716,7 +6717,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -6752,6 +6754,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -6950,6 +6953,14 @@ msgid "" "ctrl-x" msgstr "" +#, fuzzy +msgid "color for allowed values" +msgstr "color para las líneas del último registro" + +#, fuzzy +msgid "color for allowed values on the selected line" +msgstr "color para las líneas del último registro" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" @@ -7006,10 +7017,6 @@ msgstr "color para el apodo en la barra de entrada" msgid "color for quotes around string values" msgstr "color para el texto en mensajes de unión" -#, fuzzy -msgid "color for allowed values" -msgstr "color para las líneas del último registro" - #, fuzzy msgid "color for index of option" msgstr "color del texto para la descripción del cliente" @@ -7226,6 +7233,11 @@ msgstr "" msgid "fset options" msgstr "lista de opciones" +#, fuzzy, c-format +#| msgid "color" +msgid "any color" +msgstr "color" + #, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "%s%s: script \"%s\" ya registrado (registro ignorado)" diff --git a/po/fr.po b/po/fr.po index 3cba34384..8cbba99f8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" -"PO-Revision-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" +"PO-Revision-Date: 2023-07-08 16:26+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -532,6 +532,7 @@ msgstr "entier" msgid "string" msgstr "chaîne" +#, c-format msgid "any string" msgstr "toute chaîne" @@ -7496,7 +7497,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -7532,6 +7534,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -7684,7 +7687,8 @@ msgstr "" "section, option, name, parent_name, type, type_en, type_short (bool/int/str/" "col/enum), type_tiny (b/i/s/c/e), default_value, default_value_undef, value, " "quoted_value, value_undef, value_changed, parent_value, min, max, " -"description, description2, description_en, description_en2, string_values\n" +"description, description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "Les lignes avec des options sont affichées en utilisant l'évaluation de " "chaîne (voir /help eval pour le format), avec ces options :\n" @@ -7723,6 +7727,7 @@ msgstr "" "description)\" s'il n'y a pas de description\n" " - ${string_values} : valeurs chaîne autorisées pour définir une option " "de type énuméré\n" +" - ${allowed_values} : valeurs autorisées\n" " - ${marked} : \"1\" si l'option est marquée, sinon \"0\"\n" " - ${index} : index de l'option dans la liste\n" " - données de l'option, avec couleur mais sans espaces :\n" @@ -7962,6 +7967,12 @@ msgstr "" "${type} ${value2}\"), qui se fait sans évaluation de chaîne et donc plus " "rapide ; les formats peuvent être changés avec la touche ctrl+x" +msgid "color for allowed values" +msgstr "couleur pour les valeurs autorisées" + +msgid "color for allowed values on the selected line" +msgstr "couleur pour les valeurs autorisées sur la ligne sélectionnée" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" "couleur pour le nom de la couleur lorsque l'option fset.look.use_color_value " @@ -8011,9 +8022,6 @@ msgstr "couleur pour le nom dans la barre d'aide" msgid "color for quotes around string values" msgstr "couleur pour les guillemets autour des valeurs de type chaîne" -msgid "color for allowed values" -msgstr "couleur pour les valeurs autorisées" - msgid "color for index of option" msgstr "couleur pour l'index de l'option" @@ -8203,6 +8211,10 @@ msgstr "nom d'option (le caractère joker \"*\" est autorisé) (optionnel)" msgid "fset options" msgstr "options fset" +#, c-format +msgid "any color" +msgstr "toute couleur" + #, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "%s%s : script \"%s\" déjà enregistré (register ignoré)" diff --git a/po/hu.po b/po/hu.po index d8855c988..96e1c8afb 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2023-06-17 11:47+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -480,7 +480,7 @@ msgstr "perc" msgid "string" msgstr "Várakozás" -#, fuzzy +#, fuzzy, c-format msgid "any string" msgstr "Várakozás" @@ -5605,7 +5605,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -5641,6 +5642,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -5837,6 +5839,14 @@ msgid "" "ctrl-x" msgstr "" +#, fuzzy +msgid "color for allowed values" +msgstr "távollevő felhasználók nevének színe" + +#, fuzzy +msgid "color for allowed values on the selected line" +msgstr "távollevő felhasználók nevének színe" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" @@ -5891,10 +5901,6 @@ msgstr "nevek színe" msgid "color for quotes around string values" msgstr "új üzenetet tartalmazó ablak színe" -#, fuzzy -msgid "color for allowed values" -msgstr "távollevő felhasználók nevének színe" - #, fuzzy msgid "color for index of option" msgstr "információs pult határolóinak színe" @@ -6100,6 +6106,10 @@ msgstr "" msgid "fset options" msgstr "konfigurációs paraméterek beállítása" +#, fuzzy, c-format +msgid "any color" +msgstr "üzenetek színe" + #, fuzzy, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "%s a \"%s\" szerver már létezik, nem hozhatja létre!\n" diff --git a/po/it.po b/po/it.po index 75bf05346..83735f752 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -478,6 +478,7 @@ msgstr "intero" msgid "string" msgstr "stringa" +#, c-format msgid "any string" msgstr "qualsiasi stringa" @@ -6411,7 +6412,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -6447,6 +6449,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -6652,6 +6655,14 @@ msgid "" "ctrl-x" msgstr "" +#, fuzzy +msgid "color for allowed values" +msgstr "colore per la cronologia" + +#, fuzzy +msgid "color for allowed values on the selected line" +msgstr "colore per la cronologia" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" @@ -6708,10 +6719,6 @@ msgstr "colore per il nick nella riga di input" msgid "color for quotes around string values" msgstr "colore per il testo nei messaggi di entrata" -#, fuzzy -msgid "color for allowed values" -msgstr "colore per la cronologia" - #, fuzzy msgid "color for index of option" msgstr "colore del testo per la descrizione del client" @@ -6925,6 +6932,11 @@ msgstr "" msgid "fset options" msgstr "elenco delle opzioni" +#, fuzzy, c-format +#| msgid "color" +msgid "any color" +msgstr "colore" + #, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "%s%s: script \"%s\" già registrato (funzione register ignorata)" diff --git a/po/ja.po b/po/ja.po index b75cad1b6..31ad9e667 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: Polish \n" @@ -557,6 +557,7 @@ msgstr "liczba" msgid "string" msgstr "ciąg" +#, c-format msgid "any string" msgstr "dowolny ciąg" @@ -7959,7 +7960,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -7995,6 +7997,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -8422,6 +8425,14 @@ msgstr "" "który nie przetwarza ciągów, przez co jest szybszy; formaty można zmienić za " "pomocą ctrl-X" +msgid "color for allowed values" +msgstr "kolor dozwolonych wartości" + +#, fuzzy +#| msgid "color for max value on the selected line" +msgid "color for allowed values on the selected line" +msgstr "kolor maksymalnej wartości w wybranej linii" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" @@ -8472,9 +8483,6 @@ msgstr "kolor nazwy w pasku pomocy" msgid "color for quotes around string values" msgstr "kolor cudzysłowów do okoła wartości słownej" -msgid "color for allowed values" -msgstr "kolor dozwolonych wartości" - msgid "color for index of option" msgstr "kolor indeksu opcji" @@ -8653,6 +8661,11 @@ msgstr "nazwa opcji (wildcard \"*\" jest dozwolony) (opcjonalne)" msgid "fset options" msgstr "opcje fset" +#, fuzzy, c-format +#| msgid "color" +msgid "any color" +msgstr "kolor" + #, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "%s%s: skrypt \"%s\" już zarejestrowany (ignoruję)" diff --git a/po/pt.po b/po/pt.po index 255a66ac8..9e358a253 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -512,6 +512,7 @@ msgstr "inteiro" msgid "string" msgstr "cadeia" +#, c-format msgid "any string" msgstr "qualquer cadeia" @@ -7170,7 +7171,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -7206,6 +7208,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -7412,6 +7415,14 @@ msgid "" "ctrl-x" msgstr "" +#, fuzzy +msgid "color for allowed values" +msgstr "cor das linhas do registo recente" + +#, fuzzy +msgid "color for allowed values on the selected line" +msgstr "cor das linhas do registo recente" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" @@ -7472,10 +7483,6 @@ msgstr "cor do nick na barra de entrada" msgid "color for quotes around string values" msgstr "cor do texto das mensagens de join" -#, fuzzy -msgid "color for allowed values" -msgstr "cor das linhas do registo recente" - #, fuzzy msgid "color for index of option" msgstr "cor do texto da descrição do cliente" @@ -7685,6 +7692,11 @@ msgstr "nome da opção (o caráter universal \"*\" é permitido) (opcional)" msgid "fset options" msgstr "lista de opções" +#, fuzzy, c-format +#| msgid "color" +msgid "any color" +msgstr "cor" + #, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "%s%s: script \"%s\" já registado (registo ignorado)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 59334fe0d..5f98e991b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -520,6 +520,7 @@ msgstr "inteiro" msgid "string" msgstr "string" +#, c-format msgid "any string" msgstr "qualquer string" @@ -6335,7 +6336,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -6371,6 +6373,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -6576,6 +6579,14 @@ msgid "" "ctrl-x" msgstr "" +#, fuzzy +msgid "color for allowed values" +msgstr "cor de texto para valores" + +#, fuzzy +msgid "color for allowed values on the selected line" +msgstr "cor de texto para valores" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" @@ -6629,10 +6640,6 @@ msgstr "cor para o apelido na barra de entrada" msgid "color for quotes around string values" msgstr "" -#, fuzzy -msgid "color for allowed values" -msgstr "cor de texto para valores" - #, fuzzy msgid "color for index of option" msgstr "cor do texto para delimitadores de tempo" @@ -6839,6 +6846,11 @@ msgstr "" msgid "fset options" msgstr "lista de opções" +#, fuzzy, c-format +#| msgid "color" +msgid "any color" +msgstr "cor" + #, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "" diff --git a/po/ru.po b/po/ru.po index 546e90e85..3a2c799a8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2023-06-17 11:47+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -491,7 +491,7 @@ msgstr "минута" msgid "string" msgstr "Ожидание" -#, fuzzy +#, fuzzy, c-format msgid "any string" msgstr "Ожидание" @@ -5642,7 +5642,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -5678,6 +5679,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -5874,6 +5876,14 @@ msgid "" "ctrl-x" msgstr "" +#, fuzzy +msgid "color for allowed values" +msgstr "цвет отошедших ников" + +#, fuzzy +msgid "color for allowed values on the selected line" +msgstr "цвет отошедших ников" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" @@ -5928,10 +5938,6 @@ msgstr "цвет ников" msgid "color for quotes around string values" msgstr "цвет текущего окна с сообщениями" -#, fuzzy -msgid "color for allowed values" -msgstr "цвет отошедших ников" - #, fuzzy msgid "color for index of option" msgstr "цвет разделителей информационной панели" @@ -6137,6 +6143,10 @@ msgstr "" msgid "fset options" msgstr "настроить параметры конфигурации" +#, fuzzy, c-format +msgid "any color" +msgstr "цвет чата" + #, fuzzy, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "%s сервер \"%s\" уже существует, не могу создать его!\n" diff --git a/po/sr.po b/po/sr.po index 4fa1ef7fa..072cd821c 100644 --- a/po/sr.po +++ b/po/sr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -528,6 +528,7 @@ msgstr "целобројна" msgid "string" msgstr "стринг" +#, c-format msgid "any string" msgstr "било који стринг" @@ -7564,7 +7565,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -7600,6 +7602,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -8012,6 +8015,14 @@ msgstr "" "(„${marked} ${name} ${type} ${value2}”), који је без израчунавања, дакле и " "много бржи; формати могу да се пребацују тастером ctrl+x" +msgid "color for allowed values" +msgstr "боја за дозвољене вредности" + +#, fuzzy +#| msgid "color for max value on the selected line" +msgid "color for allowed values on the selected line" +msgstr "боја за макс вредност у изабраној линији" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "боја за обојено име када је укључена опција fset.look.use_color_value" @@ -8058,9 +8069,6 @@ msgstr "боја за име у траци за помоћ" msgid "color for quotes around string values" msgstr "боја за знаке навода око стринг вредности" -msgid "color for allowed values" -msgstr "боја за дозвољене вредности" - msgid "color for index of option" msgstr "боја за индекс опције" @@ -8240,6 +8248,11 @@ msgstr "име опције (дозвољен је џокер „*”) (необ msgid "fset options" msgstr "fset опције" +#, fuzzy, c-format +#| msgid "color" +msgid "any color" +msgstr "боја" + #, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "%s%s: скрипта „%s” је већ регистрована (регистрација се игнорише)" diff --git a/po/tr.po b/po/tr.po index 479f7d407..e9ce08e36 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -546,6 +546,7 @@ msgstr "tamsayı" msgid "string" msgstr "dizi" +#, c-format msgid "any string" msgstr "herhangi bir dizi" @@ -7572,7 +7573,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -7608,6 +7610,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -8030,6 +8033,14 @@ msgstr "" "değerlendirilmediğinden çok daha hızlı olur; biçimler, ctrl+X ile birbiri " "arasında değiştirilebilir" +msgid "color for allowed values" +msgstr "izin verilen değerler rengi" + +#, fuzzy +#| msgid "color for max value on the selected line" +msgid "color for allowed values on the selected line" +msgstr "seçili satırdaki en büyük değer rengi" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" @@ -8080,9 +8091,6 @@ msgstr "yardım çubuğundaki ad rengi" msgid "color for quotes around string values" msgstr "dizi değerlerinin çevresindeki tırnak imi rengi" -msgid "color for allowed values" -msgstr "izin verilen değerler rengi" - msgid "color for index of option" msgstr "bir seçenek indeksi rengi" @@ -8259,6 +8267,11 @@ msgstr "seçenek adı (\"*\" jokerine izin verilir) (isteğe bağlı)" msgid "fset options" msgstr "fset seçenekleri" +#, fuzzy, c-format +#| msgid "color" +msgid "any color" +msgstr "renk" + #, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "%s%s: \"%s\" betiği halihazırda kayıt edilmiş (kaydetme yok sayıldı)" diff --git a/po/weechat.pot b/po/weechat.pot index 5202a3286..b26cf2426 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-07-08 14:42+0200\n" +"POT-Creation-Date: 2023-07-08 16:18+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -448,6 +448,7 @@ msgstr "" msgid "string" msgstr "" +#, c-format msgid "any string" msgstr "" @@ -5170,7 +5171,8 @@ msgid "" "parent_name, type, type_en, type_short (bool/int/str/col/enum), type_tiny (b/" "i/s/c/e), default_value, default_value_undef, value, quoted_value, " "value_undef, value_changed, parent_value, min, max, description, " -"description2, description_en, description_en2, string_values\n" +"description2, description_en, description_en2, string_values, " +"allowed_values\n" "\n" "The lines with options are displayed using string evaluation (see /help eval " "for the format), with these options:\n" @@ -5206,6 +5208,7 @@ msgid "" " - ${description_en2}: option description (in English), \"(no " "description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum option\n" +" - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" @@ -5392,6 +5395,12 @@ msgid "" "ctrl-x" msgstr "" +msgid "color for allowed values" +msgstr "" + +msgid "color for allowed values on the selected line" +msgstr "" + msgid "color for color name when option fset.look.use_color_value is enabled" msgstr "" @@ -5436,9 +5445,6 @@ msgstr "" msgid "color for quotes around string values" msgstr "" -msgid "color for allowed values" -msgstr "" - msgid "color for index of option" msgstr "" @@ -5607,6 +5613,10 @@ msgstr "" msgid "fset options" msgstr "" +#, c-format +msgid "any color" +msgstr "" + #, c-format msgid "%s%s: script \"%s\" already registered (register ignored)" msgstr "" diff --git a/src/plugins/fset/fset-buffer.c b/src/plugins/fset/fset-buffer.c index bb3d53f95..5fd1e4a85 100644 --- a/src/plugins/fset/fset-buffer.c +++ b/src/plugins/fset/fset-buffer.c @@ -625,7 +625,9 @@ fset_buffer_display_option_eval (struct t_fset_option *fset_option) } /* min */ - snprintf (str_field, length_field, "%s", fset_option->min); + snprintf (str_field, length_field, + "%s", + (fset_option->min) ? fset_option->min : ""); weechat_hashtable_set (fset_buffer_hashtable_extra_vars, "__min", str_field); snprintf (str_field, length_field, @@ -642,7 +644,9 @@ fset_buffer_display_option_eval (struct t_fset_option *fset_option) "empty_min", str_field2); /* max */ - snprintf (str_field, length_field, "%s", fset_option->max); + snprintf (str_field, length_field, + "%s", + (fset_option->max) ? fset_option->max : ""); weechat_hashtable_set (fset_buffer_hashtable_extra_vars, "__max", str_field); snprintf (str_field, length_field, @@ -744,6 +748,25 @@ fset_buffer_display_option_eval (struct t_fset_option *fset_option) weechat_hashtable_set (fset_buffer_hashtable_extra_vars, "empty_string_values", str_field2); + /* allowed_values */ + snprintf (str_field, length_field, + "%s", + (fset_option->allowed_values) ? fset_option->allowed_values : ""); + weechat_hashtable_set (fset_buffer_hashtable_extra_vars, + "__allowed_values", str_field); + snprintf (str_field, length_field, + "%s%s", + weechat_color (weechat_config_string (fset_config_color_allowed_values[selected_line])), + (fset_option->allowed_values) ? fset_option->allowed_values : ""); + weechat_hashtable_set (fset_buffer_hashtable_extra_vars, + "_allowed_values", str_field); + fset_buffer_fills_field (str_field, str_field2, length_field, + fset_option_max_length->allowed_values, 1, 1); + weechat_hashtable_set (fset_buffer_hashtable_extra_vars, + "allowed_values", str_field); + weechat_hashtable_set (fset_buffer_hashtable_extra_vars, + "empty_allowed_values", str_field2); + /* marked */ snprintf (str_field, length_field, "%s", diff --git a/src/plugins/fset/fset-command.c b/src/plugins/fset/fset-command.c index 723a877a4..2468b2e7e 100644 --- a/src/plugins/fset/fset-command.c +++ b/src/plugins/fset/fset-command.c @@ -697,7 +697,7 @@ fset_command_init () "(bool/int/str/col/enum), type_tiny (b/i/s/c/e), default_value, " "default_value_undef, value, quoted_value, value_undef, " "value_changed, parent_value, min, max, description, description2, " - "description_en, description_en2, string_values\n" + "description_en, description_en2, string_values, allowed_values\n" "\n" "The lines with options are displayed using string evaluation " "(see /help eval for the format), with these options:\n" @@ -735,6 +735,7 @@ fset_command_init () "\"(no description)\" if there's no description\n" " - ${string_values}: string values allowed for set of an enum " "option\n" + " - ${allowed_values}: allowed values\n" " - ${marked}: \"1\" if option is marked, otherwise \"0\"\n" " - ${index}: index of option in list\n" " - option data, with color but no spaces:\n" diff --git a/src/plugins/fset/fset-config.c b/src/plugins/fset/fset-config.c index b3344cad9..b166818db 100644 --- a/src/plugins/fset/fset-config.c +++ b/src/plugins/fset/fset-config.c @@ -63,6 +63,7 @@ struct t_config_option *fset_config_format_option[2] = { NULL, NULL }; /* fset config, color section */ +struct t_config_option *fset_config_color_allowed_values[2] = { NULL, NULL }; struct t_config_option *fset_config_color_color_name[2] = { NULL, NULL }; struct t_config_option *fset_config_color_default_value[2] = { NULL, NULL }; struct t_config_option *fset_config_color_description[2] = { NULL, NULL }; @@ -584,7 +585,7 @@ fset_config_init () NULL, 0, 0, "${marked} ${name} ${type} ${value2}${newline}" " ${empty_name} ${_default_value}${color:244} -- " - "${_min}..${_max}${newline}" + "${_allowed_values}${newline}" " ${empty_name} ${_description}", NULL, 0, NULL, NULL, NULL, @@ -603,6 +604,22 @@ fset_config_init () NULL, NULL, NULL); if (fset_config_section_color) { + fset_config_color_allowed_values[0] = weechat_config_new_option ( + fset_config_file, fset_config_section_color, + "allowed_values", "color", + N_("color for allowed values"), + NULL, 0, 0, "default", NULL, 0, + NULL, NULL, NULL, + &fset_config_change_color_cb, NULL, NULL, + NULL, NULL, NULL); + fset_config_color_allowed_values[1] = weechat_config_new_option ( + fset_config_file, fset_config_section_color, + "allowed_values_selected", "color", + N_("color for allowed values on the selected line"), + NULL, 0, 0, "white", NULL, 0, + NULL, NULL, NULL, + &fset_config_change_color_cb, NULL, NULL, + NULL, NULL, NULL); fset_config_color_color_name[0] = weechat_config_new_option ( fset_config_file, fset_config_section_color, "color_name", "color", diff --git a/src/plugins/fset/fset-config.h b/src/plugins/fset/fset-config.h index 2579acce1..9c1f9fc3f 100644 --- a/src/plugins/fset/fset-config.h +++ b/src/plugins/fset/fset-config.h @@ -44,6 +44,7 @@ extern struct t_config_option *fset_config_format_export_option; extern struct t_config_option *fset_config_format_export_option_null; extern struct t_config_option *fset_config_format_option[2]; +extern struct t_config_option *fset_config_color_allowed_values[2]; extern struct t_config_option *fset_config_color_color_name[2]; extern struct t_config_option *fset_config_color_default_value[2]; extern struct t_config_option *fset_config_color_description[2]; diff --git a/src/plugins/fset/fset-mouse.c b/src/plugins/fset/fset-mouse.c index ccd14107d..4f3cdaf41 100644 --- a/src/plugins/fset/fset-mouse.c +++ b/src/plugins/fset/fset-mouse.c @@ -97,6 +97,7 @@ fset_mouse_focus_cb (const void *pointer, void *data, struct t_hashtable *info) weechat_hashtable_set (info, "fset_option_max", ptr_fset_option->max); weechat_hashtable_set (info, "fset_option_description", ptr_fset_option->description); weechat_hashtable_set (info, "fset_option_string_values", ptr_fset_option->string_values); + weechat_hashtable_set (info, "fset_option_allowed_values", ptr_fset_option->allowed_values); weechat_hashtable_set (info, "fset_option_marked", (ptr_fset_option->marked) ? "1" : "0"); return info; diff --git a/src/plugins/fset/fset-option.c b/src/plugins/fset/fset-option.c index f239c579f..2698a1884 100644 --- a/src/plugins/fset/fset-option.c +++ b/src/plugins/fset/fset-option.c @@ -289,6 +289,8 @@ fset_option_add_option_in_hashtable (struct t_hashtable *hashtable, fset_option->description : "(no description)"); weechat_hashtable_set (hashtable, "string_values", fset_option->string_values); + weechat_hashtable_set (hashtable, + "allowed_values", fset_option->allowed_values); weechat_hashtable_set (hashtable, "default_value_undef", (fset_option->default_value == NULL) ? "1" : "0"); @@ -435,7 +437,7 @@ fset_option_set_values (struct t_fset_option *fset_option, void *ptr_default_value, *ptr_value; struct t_config_option *ptr_parent_option; int length, *ptr_type, *ptr_min, *ptr_max; - char str_value[64]; + char str_value[64], str_allowed_values[4096]; /* file */ if (fset_option->file) @@ -588,6 +590,40 @@ fset_option_set_values (struct t_fset_option *fset_option, { fset_option->string_values = strdup (""); } + + /* allowed_values */ + if (fset_option->allowed_values) + { + free (fset_option->allowed_values); + fset_option->allowed_values = NULL; + } + str_allowed_values[0] = '\0'; + switch (fset_option->type) + { + case FSET_OPTION_TYPE_BOOLEAN: + snprintf (str_allowed_values, sizeof (str_allowed_values), + "on,off"); + break; + case FSET_OPTION_TYPE_INTEGER: + snprintf (str_allowed_values, sizeof (str_allowed_values), + "%d..%d", *ptr_min, *ptr_max); + break; + case FSET_OPTION_TYPE_STRING: + snprintf (str_allowed_values, sizeof (str_allowed_values), + _("any string")); + break; + case FSET_OPTION_TYPE_COLOR: + snprintf (str_allowed_values, sizeof (str_allowed_values), + _("any color")); + break; + case FSET_OPTION_TYPE_ENUM: + snprintf (str_allowed_values, sizeof (str_allowed_values), + "%s", fset_option->string_values); + break; + case FSET_OPTION_NUM_TYPES: + break; + } + fset_option->allowed_values = strdup (str_allowed_values); } /* @@ -734,6 +770,11 @@ fset_option_set_max_length_fields_option (struct t_fset_option *fset_option) if (length > fset_option_max_length->string_values) fset_option_max_length->string_values = length; + /* allowed_values */ + length = weechat_utf8_strlen_screen (fset_option->allowed_values); + if (length > fset_option_max_length->allowed_values) + fset_option_max_length->allowed_values = length; + /* marked */ length = weechat_utf8_strlen_screen (weechat_config_string (fset_config_look_marked_string)); if (length > fset_option_max_length->marked) @@ -806,6 +847,7 @@ fset_option_alloc (struct t_config_option *option) new_fset_option->max = NULL; new_fset_option->description = NULL; new_fset_option->string_values = NULL; + new_fset_option->allowed_values = NULL; new_fset_option->marked = 0; fset_option_set_values (new_fset_option, option); @@ -927,6 +969,8 @@ fset_option_free (struct t_fset_option *fset_option) free (fset_option->description); if (fset_option->string_values) free (fset_option->string_values); + if (fset_option->allowed_values) + free (fset_option->allowed_values); free (fset_option); } @@ -1720,6 +1764,8 @@ fset_option_add_to_infolist (struct t_infolist *infolist, return 0; if (!weechat_infolist_new_var_string (ptr_item, "string_values", fset_option->description)) return 0; + if (!weechat_infolist_new_var_string (ptr_item, "allowed_values", fset_option->allowed_values)) + return 0; if (!weechat_infolist_new_var_integer (ptr_item, "marked", fset_option->marked)) return 0; @@ -1760,6 +1806,7 @@ fset_option_print_log () weechat_log_printf (" max . . . . . . . . . : '%s'", ptr_fset_option->max); weechat_log_printf (" description . . . . . : '%s'", ptr_fset_option->description); weechat_log_printf (" string_values . . . . : '%s'", ptr_fset_option->string_values); + weechat_log_printf (" allowed_values. . . . : '%s'", ptr_fset_option->allowed_values); weechat_log_printf (" marked. . . . . . . . : %d", ptr_fset_option->marked); } } diff --git a/src/plugins/fset/fset-option.h b/src/plugins/fset/fset-option.h index 1d6041946..ccc9dd7e9 100644 --- a/src/plugins/fset/fset-option.h +++ b/src/plugins/fset/fset-option.h @@ -51,6 +51,7 @@ struct t_fset_option char *max; /* max value */ char *description; /* option description */ char *string_values; /* string values for option */ + char *allowed_values; /* allowed values (depends on type)*/ int marked; /* option marked for group oper. */ struct t_fset_option *prev_option; /* link to previous option */ struct t_fset_option *next_option; /* link to next option */ @@ -78,6 +79,7 @@ struct t_fset_option_max_length int description_en; int description_en2; int string_values; + int allowed_values; int marked; };