From 711f78f8375eb4c333caea9f48b791c0acdf276a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Tue, 21 Nov 2017 11:41:46 +0100 Subject: [PATCH] [code] Added Kandinsky module and other functions in Toolbox. Change-Id: I81a1323993c91990b13e81cbf4ea2af1ace8ef11 --- apps/code/catalog.de.i18n | 13 +++++++++++-- apps/code/catalog.en.i18n | 13 +++++++++++-- apps/code/catalog.es.i18n | 13 +++++++++++-- apps/code/catalog.fr.i18n | 13 +++++++++++-- apps/code/catalog.pt.i18n | 13 +++++++++++-- apps/code/catalog.universal.i18n | 12 ++++++++++++ apps/code/toolbox.cpp | 32 +++++++++++++++++++++++++++----- apps/code/toolbox.universal.i18n | 1 + 8 files changed, 95 insertions(+), 15 deletions(-) diff --git a/apps/code/catalog.de.i18n b/apps/code/catalog.de.i18n index ee77db34b..f290531e9 100644 --- a/apps/code/catalog.de.i18n +++ b/apps/code/catalog.de.i18n @@ -18,12 +18,15 @@ PythonAtan2 = "Return arctan(y/x)" PythonAtanh = "Arc hyperbolic tangent" PythonBin = "Convert integer to binary" PythonCeil = "Ceiling" +PythonCmathFunction = "Cmath module function prefix" +PythonColor = "Define a rgb color" PythonComplex = "Return a+ib" PythonCopySign = "Return x with the sign of y" PythonCos = "Cosine" PythonCosh = "Hyperbolic cosine" PythonDegrees = "Convert x from radians to degrees" PythonDivMod = "Quotient and remainder" +PythonDrawString = "Display a text from pixel (x,y)" PythonConstantE = "2.718281828459046" PythonErf = "Error function" PythonErfc = "Complementary error function" @@ -33,22 +36,27 @@ PythonFabs = "Absolute value" PythonFloor = "Floor" PythonFmod = "a modulo b" PythonFrExp = "Mantissa and exponent of x" -PythonImportFromCmath = "Import cmath module" -PythonImportFromMath = "Import math module" PythonGamma = "Gamma function" +PythonGetPixel = "Return pixel (x,y) color" PythonHex = "Convert integer to hexadecimal" PythonImportCmath = "Import cmath module" +PythonImportKandinsky = "Import kandinsky module" PythonImportMath = "Import math module" +PythonImportFromCmath = "Import cmath module" +PythonImportFromKandinsky = "Import kandinsky module" +PythonImportFromMath = "Import math module" PythonInt = "Convert x to an integer" PythonIsFinite = "Check if x is finite" PythonIsInfinite = "Check if x is infinity" PythonIsNaN = "Check if x is a NaN" +PythonKandinskyFunction = "Kandinsky module function prefix" PythonLdexp = "Return x*(2**i), inverse of frexp" PythonLength = "Length of an object" PythonLgamma = "Log-gamma function" PythonLog = "Logarithm to base a" PythonLog10 = "Logarithm to base 10" PythonLog2 = "Logarithm to base 2" +PythonMathFunction = "Math module function prefix" PythonMax = "Maximum" PythonMin = "Minimum" PythonModf = "Fractional and integer parts of x" @@ -63,6 +71,7 @@ PythonRangeStartStop = "List from start to stop-1" PythonRangeStop = "List from 0 to stop-1" PythonRect = "z in cartesian coordinates" PythonRound = "Round to n digits" +PythonSetPixel = "Color pixel (x,y)" PythonSin = "Sine" PythonSinh = "Hyperbolic sine" PythonSorted = "Sort a list" diff --git a/apps/code/catalog.en.i18n b/apps/code/catalog.en.i18n index ee77db34b..f290531e9 100644 --- a/apps/code/catalog.en.i18n +++ b/apps/code/catalog.en.i18n @@ -18,12 +18,15 @@ PythonAtan2 = "Return arctan(y/x)" PythonAtanh = "Arc hyperbolic tangent" PythonBin = "Convert integer to binary" PythonCeil = "Ceiling" +PythonCmathFunction = "Cmath module function prefix" +PythonColor = "Define a rgb color" PythonComplex = "Return a+ib" PythonCopySign = "Return x with the sign of y" PythonCos = "Cosine" PythonCosh = "Hyperbolic cosine" PythonDegrees = "Convert x from radians to degrees" PythonDivMod = "Quotient and remainder" +PythonDrawString = "Display a text from pixel (x,y)" PythonConstantE = "2.718281828459046" PythonErf = "Error function" PythonErfc = "Complementary error function" @@ -33,22 +36,27 @@ PythonFabs = "Absolute value" PythonFloor = "Floor" PythonFmod = "a modulo b" PythonFrExp = "Mantissa and exponent of x" -PythonImportFromCmath = "Import cmath module" -PythonImportFromMath = "Import math module" PythonGamma = "Gamma function" +PythonGetPixel = "Return pixel (x,y) color" PythonHex = "Convert integer to hexadecimal" PythonImportCmath = "Import cmath module" +PythonImportKandinsky = "Import kandinsky module" PythonImportMath = "Import math module" +PythonImportFromCmath = "Import cmath module" +PythonImportFromKandinsky = "Import kandinsky module" +PythonImportFromMath = "Import math module" PythonInt = "Convert x to an integer" PythonIsFinite = "Check if x is finite" PythonIsInfinite = "Check if x is infinity" PythonIsNaN = "Check if x is a NaN" +PythonKandinskyFunction = "Kandinsky module function prefix" PythonLdexp = "Return x*(2**i), inverse of frexp" PythonLength = "Length of an object" PythonLgamma = "Log-gamma function" PythonLog = "Logarithm to base a" PythonLog10 = "Logarithm to base 10" PythonLog2 = "Logarithm to base 2" +PythonMathFunction = "Math module function prefix" PythonMax = "Maximum" PythonMin = "Minimum" PythonModf = "Fractional and integer parts of x" @@ -63,6 +71,7 @@ PythonRangeStartStop = "List from start to stop-1" PythonRangeStop = "List from 0 to stop-1" PythonRect = "z in cartesian coordinates" PythonRound = "Round to n digits" +PythonSetPixel = "Color pixel (x,y)" PythonSin = "Sine" PythonSinh = "Hyperbolic sine" PythonSorted = "Sort a list" diff --git a/apps/code/catalog.es.i18n b/apps/code/catalog.es.i18n index ee77db34b..f290531e9 100644 --- a/apps/code/catalog.es.i18n +++ b/apps/code/catalog.es.i18n @@ -18,12 +18,15 @@ PythonAtan2 = "Return arctan(y/x)" PythonAtanh = "Arc hyperbolic tangent" PythonBin = "Convert integer to binary" PythonCeil = "Ceiling" +PythonCmathFunction = "Cmath module function prefix" +PythonColor = "Define a rgb color" PythonComplex = "Return a+ib" PythonCopySign = "Return x with the sign of y" PythonCos = "Cosine" PythonCosh = "Hyperbolic cosine" PythonDegrees = "Convert x from radians to degrees" PythonDivMod = "Quotient and remainder" +PythonDrawString = "Display a text from pixel (x,y)" PythonConstantE = "2.718281828459046" PythonErf = "Error function" PythonErfc = "Complementary error function" @@ -33,22 +36,27 @@ PythonFabs = "Absolute value" PythonFloor = "Floor" PythonFmod = "a modulo b" PythonFrExp = "Mantissa and exponent of x" -PythonImportFromCmath = "Import cmath module" -PythonImportFromMath = "Import math module" PythonGamma = "Gamma function" +PythonGetPixel = "Return pixel (x,y) color" PythonHex = "Convert integer to hexadecimal" PythonImportCmath = "Import cmath module" +PythonImportKandinsky = "Import kandinsky module" PythonImportMath = "Import math module" +PythonImportFromCmath = "Import cmath module" +PythonImportFromKandinsky = "Import kandinsky module" +PythonImportFromMath = "Import math module" PythonInt = "Convert x to an integer" PythonIsFinite = "Check if x is finite" PythonIsInfinite = "Check if x is infinity" PythonIsNaN = "Check if x is a NaN" +PythonKandinskyFunction = "Kandinsky module function prefix" PythonLdexp = "Return x*(2**i), inverse of frexp" PythonLength = "Length of an object" PythonLgamma = "Log-gamma function" PythonLog = "Logarithm to base a" PythonLog10 = "Logarithm to base 10" PythonLog2 = "Logarithm to base 2" +PythonMathFunction = "Math module function prefix" PythonMax = "Maximum" PythonMin = "Minimum" PythonModf = "Fractional and integer parts of x" @@ -63,6 +71,7 @@ PythonRangeStartStop = "List from start to stop-1" PythonRangeStop = "List from 0 to stop-1" PythonRect = "z in cartesian coordinates" PythonRound = "Round to n digits" +PythonSetPixel = "Color pixel (x,y)" PythonSin = "Sine" PythonSinh = "Hyperbolic sine" PythonSorted = "Sort a list" diff --git a/apps/code/catalog.fr.i18n b/apps/code/catalog.fr.i18n index 70d7e6fe5..6861c0598 100644 --- a/apps/code/catalog.fr.i18n +++ b/apps/code/catalog.fr.i18n @@ -18,12 +18,15 @@ PythonAtan2 = "Calcul de arctan(y/x)" PythonAtanh = "Arc tangente hyperbolique" PythonBin = "Conversion d'un entier en binaire" PythonCeil = "Plafond" +PythonCmathFunction = "Préfixe fonction du module cmath" +PythonColor = "Définit une couleur rgb" PythonComplex = "Retourne a+ib" PythonCopySign = "Retourne x avec le signe de y" PythonCos = "Cosinus" PythonCosh = "Cosinus hyperbolique" PythonDegrees = "Conversion de radians en degrés" PythonDivMod = "Quotient et reste" +PythonDrawString = "Affiche un texte au pixel (x,y)" PythonConstantE = "2.718281828459045" PythonErf = "Fonction d'erreur" PythonErfc = "Fonction d'erreur complémentaire" @@ -33,22 +36,27 @@ PythonFabs = "Valeur absolue" PythonFloor = "Partie entière" PythonFmod = "a modulo b" PythonFrExp = "Mantisse et exposant de x : (m,e)" -PythonImportFromCmath = "Importation du module cmath" -PythonImportFromMath = "Importation du module math" PythonGamma = "Fonction gamma" +PythonGetPixel = "Return pixel (x,y) color" PythonHex = "Conversion entier en hexadécimal" PythonImportCmath = "Importation du module cmath" +PythonImportKandinsky = "Importation du module kandinsky" PythonImportMath = "Importation du module math" +PythonImportFromCmath = "Importation du module cmath" +PythonImportFromKandinsky = "Importation du module kandinsky" +PythonImportFromMath = "Importation du module math" PythonInt = "Conversion en entier" PythonIsFinite = "Teste si x est fini" PythonIsInfinite = "Teste si x est infini" PythonIsNaN = "Teste si x est NaN" +PythonKandinskyFunction = "Préfixe fonction module kandinsky" PythonLdexp = "Inverse de frexp : x*(2**i)" PythonLength = "Longueur d'un objet" PythonLgamma = "Logarithme de la fonction gamma" PythonLog = "Logarithme base a" PythonLog10 = "Logarithme base 10" PythonLog2 = "Logarithme base 2" +PythonMathFunction = "Préfixe fonction du module math" PythonMax = "Maximum" PythonMin = "Minimum" PythonModf = "Parties fractionnaire et entière" @@ -63,6 +71,7 @@ PythonRangeStartStop = "Liste de start à stop-1" PythonRangeStop = "Liste de 0 à stop-1" PythonRect = "Conversion en algébrique" PythonRound = "Arrondi n chiffres" +PythonSetPixel = "Colore le pixel (x,y)" PythonSin = "Sinus" PythonSinh = "Sinus hyperbolique" PythonSorted = "Tri d'une liste" diff --git a/apps/code/catalog.pt.i18n b/apps/code/catalog.pt.i18n index ee77db34b..f290531e9 100644 --- a/apps/code/catalog.pt.i18n +++ b/apps/code/catalog.pt.i18n @@ -18,12 +18,15 @@ PythonAtan2 = "Return arctan(y/x)" PythonAtanh = "Arc hyperbolic tangent" PythonBin = "Convert integer to binary" PythonCeil = "Ceiling" +PythonCmathFunction = "Cmath module function prefix" +PythonColor = "Define a rgb color" PythonComplex = "Return a+ib" PythonCopySign = "Return x with the sign of y" PythonCos = "Cosine" PythonCosh = "Hyperbolic cosine" PythonDegrees = "Convert x from radians to degrees" PythonDivMod = "Quotient and remainder" +PythonDrawString = "Display a text from pixel (x,y)" PythonConstantE = "2.718281828459046" PythonErf = "Error function" PythonErfc = "Complementary error function" @@ -33,22 +36,27 @@ PythonFabs = "Absolute value" PythonFloor = "Floor" PythonFmod = "a modulo b" PythonFrExp = "Mantissa and exponent of x" -PythonImportFromCmath = "Import cmath module" -PythonImportFromMath = "Import math module" PythonGamma = "Gamma function" +PythonGetPixel = "Return pixel (x,y) color" PythonHex = "Convert integer to hexadecimal" PythonImportCmath = "Import cmath module" +PythonImportKandinsky = "Import kandinsky module" PythonImportMath = "Import math module" +PythonImportFromCmath = "Import cmath module" +PythonImportFromKandinsky = "Import kandinsky module" +PythonImportFromMath = "Import math module" PythonInt = "Convert x to an integer" PythonIsFinite = "Check if x is finite" PythonIsInfinite = "Check if x is infinity" PythonIsNaN = "Check if x is a NaN" +PythonKandinskyFunction = "Kandinsky module function prefix" PythonLdexp = "Return x*(2**i), inverse of frexp" PythonLength = "Length of an object" PythonLgamma = "Log-gamma function" PythonLog = "Logarithm to base a" PythonLog10 = "Logarithm to base 10" PythonLog2 = "Logarithm to base 2" +PythonMathFunction = "Math module function prefix" PythonMax = "Maximum" PythonMin = "Minimum" PythonModf = "Fractional and integer parts of x" @@ -63,6 +71,7 @@ PythonRangeStartStop = "List from start to stop-1" PythonRangeStop = "List from 0 to stop-1" PythonRect = "z in cartesian coordinates" PythonRound = "Round to n digits" +PythonSetPixel = "Color pixel (x,y)" PythonSin = "Sine" PythonSinh = "Hyperbolic sine" PythonSorted = "Sort a list" diff --git a/apps/code/catalog.universal.i18n b/apps/code/catalog.universal.i18n index a5600f3bb..2fd925345 100644 --- a/apps/code/catalog.universal.i18n +++ b/apps/code/catalog.universal.i18n @@ -16,6 +16,9 @@ PythonCommandAtan2 = "atan2(y,x)" PythonCommandAtanh = "atanh(x)" PythonCommandBin = "bin(x)" PythonCommandCeil = "ceil(x)" +PythonCommandCmathFunction = "cmath.function" +PythonCommandCmathFunctionWithoutArg = "cmath." +PythonCommandColor = "color(r,g,b)" PythonCommandComplex = "complex(a,b)" PythonCommandCopySign = "copysign(x,y)" PythonCommandCos = "cos(x)" @@ -23,6 +26,7 @@ PythonCommandCosComplex = "cos(z)" PythonCommandCosh = "cosh(x)" PythonCommandDegrees = "degrees(x)" PythonCommandDivMod = "divmod(a,b)" +PythonCommandDrawString = "draw_string(\"text\",x,y)" PythonCommandConstantE = "e" PythonCommandErf = "erf(x)" PythonCommandErfc = "erfc(x)" @@ -34,15 +38,20 @@ PythonCommandFloor = "floor(x)" PythonCommandFmod = "fmod(a,b)" PythonCommandFrExp = "frexp(x)" PythonCommandGamma = "gamma(x)" +PythonCommandGetPixel = "get_pixel(x,y)" PythonCommandImportFromCmath = "from cmath import *" PythonCommandImportFromMath = "from math import *" +PythonCommandImportFromKandinsky = "from kandinsky import *" PythonCommandHex = "hex(x)" PythonCommandImportCmath = "import cmath" +PythonCommandImportKandinsky = "import kandinsky" PythonCommandImportMath = "import math" PythonCommandInt = "int(x)" PythonCommandIsFinite = "isfinite(x)" PythonCommandIsInfinite = "isinf(x)" PythonCommandIsNaN = "isnan(x)" +PythonCommandKandinskyFunction = "kandinsky.function" +PythonCommandKandinskyFunctionWithoutArg = "kandinsky." PythonCommandLdexp = "ldexp(x,i)" PythonCommandLgamma = "lgamma(x)" PythonCommandLength = "len(object)" @@ -50,6 +59,8 @@ PythonCommandLog = "log(x,a)" PythonCommandLog10 = "log10(x)" PythonCommandLog2 = "log2(x)" PythonCommandLogComplex = "log(z,a)" +PythonCommandMathFunction = "math.function" +PythonCommandMathFunctionWithoutArg = "math." PythonCommandMax = "max(list)" PythonCommandMin = "min(list)" PythonCommandModf = "modf(x)" @@ -64,6 +75,7 @@ PythonCommandRangeStartStop = "range(start, stop)" PythonCommandRangeStop = "range(stop)" PythonCommandRect = "rect(r, arg)" PythonCommandRound = "round(x, n)" +PythonCommandSetPixel = "set_pixel(x,y,color)" PythonCommandSin = "sin(x)" PythonCommandSinComplex = "sin(z)" PythonCommandSinh = "sinh(x)" diff --git a/apps/code/toolbox.cpp b/apps/code/toolbox.cpp index 734c091af..1520a538d 100644 --- a/apps/code/toolbox.cpp +++ b/apps/code/toolbox.cpp @@ -8,16 +8,17 @@ extern "C" { namespace Code { -static constexpr int catalogChildrenCount = 73; -static constexpr int MathModuleChildrenCount = 42; -static constexpr int CMathModuleChildrenCount = 12; +static constexpr int catalogChildrenCount = 82; +static constexpr int MathModuleChildrenCount = 43; +static constexpr int KandinskyModuleChildrenCount = 7; +static constexpr int CMathModuleChildrenCount = 13; static constexpr int conditionsChildrenCount = 9; static constexpr int forLoopChildrenCount = 4; static constexpr int functionsChildrenCount = 2; static constexpr int ifStatementChildrenCount = 5; static constexpr int loopsAndTestsChildrenCount = 4; static constexpr int menuChildrenCount = 4; -static constexpr int modulesChildrenCount = 2; +static constexpr int modulesChildrenCount = 3; static constexpr int whileLoopChildrenCount = 1; @@ -57,6 +58,7 @@ const ToolboxMessageTree loopsAndTestsChildren[loopsAndTestsChildrenCount] = { const ToolboxMessageTree MathModuleChildren[MathModuleChildrenCount] = { ToolboxMessageTree(I18n::Message::PythonCommandImportMath, I18n::Message::PythonImportMath, I18n::Message::PythonCommandImportMath), ToolboxMessageTree(I18n::Message::PythonCommandImportFromMath, I18n::Message::PythonImportFromMath, I18n::Message::PythonCommandImportFromMath), + ToolboxMessageTree(I18n::Message::PythonCommandMathFunction, I18n::Message::PythonMathFunction, I18n::Message::PythonCommandMathFunctionWithoutArg), ToolboxMessageTree(I18n::Message::PythonCommandConstantE, I18n::Message::PythonConstantE, I18n::Message::PythonCommandConstantE), ToolboxMessageTree(I18n::Message::PythonCommandConstantPi, I18n::Message::PythonConstantPi, I18n::Message::PythonCommandConstantPi), ToolboxMessageTree(I18n::Message::PythonCommandSqrt, I18n::Message::PythonSqrt, I18n::Message::PythonCommandSqrt), @@ -98,9 +100,19 @@ const ToolboxMessageTree MathModuleChildren[MathModuleChildrenCount] = { ToolboxMessageTree(I18n::Message::PythonCommandGamma, I18n::Message::PythonGamma, I18n::Message::PythonCommandGamma), ToolboxMessageTree(I18n::Message::PythonCommandLgamma, I18n::Message::PythonLgamma, I18n::Message::PythonCommandLgamma)}; +const ToolboxMessageTree KandinskyModuleChildren[KandinskyModuleChildrenCount] = { + ToolboxMessageTree(I18n::Message::PythonCommandImportKandinsky, I18n::Message::PythonImportKandinsky, I18n::Message::PythonCommandImportKandinsky), + ToolboxMessageTree(I18n::Message::PythonCommandImportFromKandinsky, I18n::Message::PythonImportFromKandinsky, I18n::Message::PythonCommandImportFromKandinsky), + ToolboxMessageTree(I18n::Message::PythonCommandKandinskyFunction, I18n::Message::PythonKandinskyFunction, I18n::Message::PythonCommandKandinskyFunctionWithoutArg), + ToolboxMessageTree(I18n::Message::PythonCommandGetPixel, I18n::Message::PythonGetPixel, I18n::Message::PythonCommandGetPixel), + ToolboxMessageTree(I18n::Message::PythonCommandSetPixel, I18n::Message::PythonSetPixel, I18n::Message::PythonCommandSetPixel), + ToolboxMessageTree(I18n::Message::PythonCommandColor, I18n::Message::PythonColor, I18n::Message::PythonCommandColor), + ToolboxMessageTree(I18n::Message::PythonCommandDrawString, I18n::Message::PythonCommandDrawString, I18n::Message::PythonCommandDrawString)}; + const ToolboxMessageTree CMathModuleChildren[CMathModuleChildrenCount] = { ToolboxMessageTree(I18n::Message::PythonCommandImportCmath, I18n::Message::PythonImportCmath, I18n::Message::PythonCommandImportCmath), ToolboxMessageTree(I18n::Message::PythonCommandImportFromCmath, I18n::Message::PythonImportFromCmath, I18n::Message::PythonCommandImportFromCmath), + ToolboxMessageTree(I18n::Message::PythonCommandCmathFunction, I18n::Message::PythonCmathFunction, I18n::Message::PythonCommandCmathFunctionWithoutArg), ToolboxMessageTree(I18n::Message::PythonCommandConstantE, I18n::Message::PythonConstantE, I18n::Message::PythonCommandConstantE), ToolboxMessageTree(I18n::Message::PythonCommandConstantPi, I18n::Message::PythonConstantPi, I18n::Message::PythonCommandConstantPi), ToolboxMessageTree(I18n::Message::PythonCommandPhase, I18n::Message::PythonPhase, I18n::Message::PythonCommandPhase), @@ -114,7 +126,8 @@ const ToolboxMessageTree CMathModuleChildren[CMathModuleChildrenCount] = { const ToolboxMessageTree modulesChildren[modulesChildrenCount] = { ToolboxMessageTree(I18n::Message::MathModule, I18n::Message::Default, I18n::Message::Default, MathModuleChildren, MathModuleChildrenCount), - ToolboxMessageTree(I18n::Message::CmathModule, I18n::Message::Default, I18n::Message::Default, CMathModuleChildren, CMathModuleChildrenCount)}; + ToolboxMessageTree(I18n::Message::CmathModule, I18n::Message::Default, I18n::Message::Default, CMathModuleChildren, CMathModuleChildrenCount), + ToolboxMessageTree(I18n::Message::KandinskyModule, I18n::Message::Default, I18n::Message::Default, KandinskyModuleChildren, KandinskyModuleChildrenCount)}; const ToolboxMessageTree catalogChildren[catalogChildrenCount] = { ToolboxMessageTree(I18n::Message::PythonCommandPound, I18n::Message::PythonPound, I18n::Message::PythonCommandPound), @@ -135,12 +148,15 @@ const ToolboxMessageTree catalogChildren[catalogChildrenCount] = { ToolboxMessageTree(I18n::Message::PythonCommandAtanh, I18n::Message::PythonAtanh, I18n::Message::PythonCommandAtanh), ToolboxMessageTree(I18n::Message::PythonCommandBin, I18n::Message::PythonBin, I18n::Message::PythonCommandBin), ToolboxMessageTree(I18n::Message::PythonCommandCeil, I18n::Message::PythonCeil, I18n::Message::PythonCommandCeil), + ToolboxMessageTree(I18n::Message::PythonCommandCmathFunction, I18n::Message::PythonCmathFunction, I18n::Message::PythonCommandCmathFunctionWithoutArg), + ToolboxMessageTree(I18n::Message::PythonCommandColor, I18n::Message::PythonColor, I18n::Message::PythonCommandColor), ToolboxMessageTree(I18n::Message::PythonCommandComplex, I18n::Message::PythonComplex, I18n::Message::PythonCommandComplex), ToolboxMessageTree(I18n::Message::PythonCommandCopySign, I18n::Message::PythonCopySign, I18n::Message::PythonCommandCopySign), ToolboxMessageTree(I18n::Message::PythonCommandCos, I18n::Message::PythonCos, I18n::Message::PythonCommandCos), ToolboxMessageTree(I18n::Message::PythonCommandCosh, I18n::Message::PythonCosh, I18n::Message::PythonCommandCosh), ToolboxMessageTree(I18n::Message::PythonCommandDegrees, I18n::Message::PythonDegrees, I18n::Message::PythonCommandDegrees), ToolboxMessageTree(I18n::Message::PythonCommandDivMod, I18n::Message::PythonDivMod, I18n::Message::PythonCommandDivMod), + ToolboxMessageTree(I18n::Message::PythonCommandDrawString, I18n::Message::PythonDrawString, I18n::Message::PythonCommandDrawString), ToolboxMessageTree(I18n::Message::PythonCommandConstantE, I18n::Message::PythonConstantE, I18n::Message::PythonCommandConstantE), ToolboxMessageTree(I18n::Message::PythonCommandErf, I18n::Message::PythonErf, I18n::Message::PythonCommandErf), ToolboxMessageTree(I18n::Message::PythonCommandErfc, I18n::Message::PythonErfc, I18n::Message::PythonCommandErfc), @@ -151,21 +167,26 @@ const ToolboxMessageTree catalogChildren[catalogChildrenCount] = { ToolboxMessageTree(I18n::Message::PythonCommandFmod, I18n::Message::PythonFmod, I18n::Message::PythonCommandFmod), ToolboxMessageTree(I18n::Message::PythonCommandFrExp, I18n::Message::PythonFrExp, I18n::Message::PythonCommandFrExp), ToolboxMessageTree(I18n::Message::PythonCommandImportFromCmath, I18n::Message::PythonImportFromCmath, I18n::Message::PythonCommandImportFromCmath), + ToolboxMessageTree(I18n::Message::PythonCommandImportFromKandinsky, I18n::Message::PythonImportFromKandinsky, I18n::Message::PythonCommandImportFromKandinsky), ToolboxMessageTree(I18n::Message::PythonCommandImportFromMath, I18n::Message::PythonImportFromMath, I18n::Message::PythonCommandImportFromMath), ToolboxMessageTree(I18n::Message::PythonCommandGamma, I18n::Message::PythonGamma, I18n::Message::PythonCommandGamma), + ToolboxMessageTree(I18n::Message::PythonCommandGetPixel, I18n::Message::PythonGetPixel, I18n::Message::PythonCommandGetPixel), ToolboxMessageTree(I18n::Message::PythonCommandHex, I18n::Message::PythonHex, I18n::Message::PythonCommandHex), ToolboxMessageTree(I18n::Message::PythonCommandImportCmath, I18n::Message::PythonImportCmath, I18n::Message::PythonCommandImportCmath), + ToolboxMessageTree(I18n::Message::PythonCommandImportKandinsky, I18n::Message::PythonImportKandinsky, I18n::Message::PythonCommandImportKandinsky), ToolboxMessageTree(I18n::Message::PythonCommandImportMath, I18n::Message::PythonImportMath, I18n::Message::PythonCommandImportMath), ToolboxMessageTree(I18n::Message::PythonCommandInt, I18n::Message::PythonInt, I18n::Message::PythonCommandInt), ToolboxMessageTree(I18n::Message::PythonCommandIsFinite, I18n::Message::PythonIsFinite, I18n::Message::PythonCommandIsFinite), ToolboxMessageTree(I18n::Message::PythonCommandIsInfinite, I18n::Message::PythonIsInfinite, I18n::Message::PythonCommandIsInfinite), ToolboxMessageTree(I18n::Message::PythonCommandIsNaN, I18n::Message::PythonIsNaN, I18n::Message::PythonCommandIsNaN), + ToolboxMessageTree(I18n::Message::PythonCommandKandinskyFunction, I18n::Message::PythonKandinskyFunction, I18n::Message::PythonCommandKandinskyFunctionWithoutArg), ToolboxMessageTree(I18n::Message::PythonCommandLdexp, I18n::Message::PythonLdexp, I18n::Message::PythonCommandLdexp), ToolboxMessageTree(I18n::Message::PythonCommandLength, I18n::Message::PythonLength, I18n::Message::PythonCommandLength), ToolboxMessageTree(I18n::Message::PythonCommandLgamma, I18n::Message::PythonLgamma, I18n::Message::PythonCommandLgamma), ToolboxMessageTree(I18n::Message::PythonCommandLog, I18n::Message::PythonLog, I18n::Message::PythonCommandLog), ToolboxMessageTree(I18n::Message::PythonCommandLog10, I18n::Message::PythonLog10, I18n::Message::PythonCommandLog10), ToolboxMessageTree(I18n::Message::PythonCommandLog2, I18n::Message::PythonLog2, I18n::Message::PythonCommandLog2), + ToolboxMessageTree(I18n::Message::PythonCommandMathFunction, I18n::Message::PythonMathFunction, I18n::Message::PythonCommandMathFunctionWithoutArg), ToolboxMessageTree(I18n::Message::PythonCommandMax, I18n::Message::PythonMax, I18n::Message::PythonCommandMax), ToolboxMessageTree(I18n::Message::PythonCommandMin, I18n::Message::PythonMin, I18n::Message::PythonCommandMin), ToolboxMessageTree(I18n::Message::PythonCommandModf, I18n::Message::PythonModf, I18n::Message::PythonCommandModf), @@ -180,6 +201,7 @@ const ToolboxMessageTree catalogChildren[catalogChildrenCount] = { ToolboxMessageTree(I18n::Message::PythonCommandRangeStop, I18n::Message::PythonRangeStop, I18n::Message::PythonCommandRangeStop), ToolboxMessageTree(I18n::Message::PythonCommandRect, I18n::Message::PythonRect, I18n::Message::PythonCommandRect), ToolboxMessageTree(I18n::Message::PythonCommandRound, I18n::Message::PythonRound, I18n::Message::PythonCommandRound), + ToolboxMessageTree(I18n::Message::PythonCommandSetPixel, I18n::Message::PythonSetPixel, I18n::Message::PythonCommandSetPixel), ToolboxMessageTree(I18n::Message::PythonCommandSin, I18n::Message::PythonSin, I18n::Message::PythonCommandSin), ToolboxMessageTree(I18n::Message::PythonCommandSinh, I18n::Message::PythonSinh, I18n::Message::PythonCommandSinh), ToolboxMessageTree(I18n::Message::PythonCommandSorted, I18n::Message::PythonSorted, I18n::Message::PythonCommandSorted), diff --git a/apps/code/toolbox.universal.i18n b/apps/code/toolbox.universal.i18n index f546cf39c..caac8c1a9 100644 --- a/apps/code/toolbox.universal.i18n +++ b/apps/code/toolbox.universal.i18n @@ -1,5 +1,6 @@ MathModule = "math" CmathModule = "cmath" +KandinskyModule = "kandinsky" ForLoopMenu = "For" IfStatementMenu = "If" WhileLoopMenu = "While"