From 978c3e28e99cf9868e2ba4a0b87944e2e19866da Mon Sep 17 00:00:00 2001 From: 0b101 <0b101@users.noreply.github.com> Date: Mon, 17 Feb 2020 08:54:43 -0600 Subject: [PATCH 001/830] Added more units --- apps/math_toolbox.cpp | 15 +++++++++++++++ apps/shared.universal.i18n | 7 +++++++ apps/toolbox.de.i18n | 9 +++++++++ apps/toolbox.en.i18n | 9 +++++++++ apps/toolbox.es.i18n | 9 +++++++++ apps/toolbox.fr.i18n | 9 +++++++++ apps/toolbox.hu.i18n | 9 +++++++++ apps/toolbox.pt.i18n | 9 +++++++++ poincare/include/poincare/unit.h | 22 +++++++++++++++++++++- 9 files changed, 97 insertions(+), 1 deletion(-) diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp index cbc9871a3..10583a00c 100644 --- a/apps/math_toolbox.cpp +++ b/apps/math_toolbox.cpp @@ -109,13 +109,28 @@ const ToolboxMessageTree unitDistanceMeterChildren[] = { ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMeterPicoSymbol, I18n::Message::UnitDistanceMeterPico), }; +const ToolboxMessageTree unitDistanceImperialChildren[] = { + ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceInchSymbol, I18n::Message::UnitDistanceInch), + ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceFootSymbol, I18n::Message::UnitDistanceFoot), + ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceYardSymbol, I18n::Message::UnitDistanceYard), + ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceMileSymbol, I18n::Message::UnitDistanceMile), +}; + const ToolboxMessageTree unitDistanceChildren[] = { ToolboxMessageTree::Node(I18n::Message::UnitDistanceMeterMenu, unitDistanceMeterChildren), + ToolboxMessageTree::Node(I18n::Message::UnitDistanceImperialMenu, unitDistanceImperialChildren), ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceAstronomicalUnitSymbol, I18n::Message::UnitDistanceAstronomicalUnit), ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceLightYearSymbol, I18n::Message::UnitDistanceLightYear), ToolboxMessageTree::Leaf(I18n::Message::UnitDistanceParsecSymbol, I18n::Message::UnitDistanceParsec)}; +const ToolboxMessageTree unitMassImperialChildren[] = { + ToolboxMessageTree::Leaf(I18n::Message::UnitMassPoundSymbol, I18n::Message::UnitMassPound), + ToolboxMessageTree::Leaf(I18n::Message::UnitMassOunceSymbol, I18n::Message::UnitMassOunce), + ToolboxMessageTree::Leaf(I18n::Message::UnitMassTonSymbol, I18n::Message::UnitMassTon), +}; + const ToolboxMessageTree unitMassChildren[] = { + ToolboxMessageTree::Node(I18n::Message::UnitMassImperialMenu, unitMassImperialChildren), ToolboxMessageTree::Leaf(I18n::Message::UnitMassTonneSymbol, I18n::Message::UnitMassTonne), ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramKiloSymbol, I18n::Message::UnitMassGramKilo), ToolboxMessageTree::Leaf(I18n::Message::UnitMassGramSymbol, I18n::Message::UnitMassGram), diff --git a/apps/shared.universal.i18n b/apps/shared.universal.i18n index 2d980f283..71f7d0fa2 100644 --- a/apps/shared.universal.i18n +++ b/apps/shared.universal.i18n @@ -14,9 +14,16 @@ UnitDistanceMeterMilliSymbol = "_mm" UnitDistanceMeterMicroSymbol = "_μm" UnitDistanceMeterNanoSymbol = "_nm" UnitDistanceMeterPicoSymbol = "_pm" +UnitDistanceInchSymbol = "_in" +UnitDistanceFootSymbol = "_ft" +UnitDistanceYardSymbol = "_yd" +UnitDistanceMileSymbol = "_mi" UnitDistanceAstronomicalUnitSymbol = "_au" UnitDistanceLightYearSymbol = "_ly" UnitDistanceParsecSymbol = "_pc" +UnitMassPoundSymbol = "_lb" +UnitMassOunceSymbol = "_oz" +UnitMassTonSymbol = "_ton" UnitMassGramKiloSymbol = "_kg" UnitMassGramSymbol = "_g" UnitMassGramMilliSymbol = "_mg" diff --git a/apps/toolbox.de.i18n b/apps/toolbox.de.i18n index 61999f5f7..c2b47cd05 100644 --- a/apps/toolbox.de.i18n +++ b/apps/toolbox.de.i18n @@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Millimeter" UnitDistanceMeterMicro = "Micrometer" UnitDistanceMeterNano = "Nanometer" UnitDistanceMeterPico = "Picometer" +UnitDistanceImperialMenu = "US Customary" +UnitDistanceInch = "Inch" +UnitDistanceFoot = "Foot" +UnitDistanceYard = "Yard" +UnitDistanceMile = "Mile" UnitDistanceAstronomicalUnit = "Astronomical unit" UnitDistanceLightYear = "Light year" UnitDistanceParsec = "Parsec" +UnitMassImperialMenu = "US Customary" +UnitMassPound = "Pound" +UnitMassOunce = "Ounce" +UnitMassTon = "US Ton" UnitMassMenu = "Mass" UnitMassGramKilo = "Kilogram" UnitMassGram = "Gram" diff --git a/apps/toolbox.en.i18n b/apps/toolbox.en.i18n index eec7d5bfd..db058136d 100644 --- a/apps/toolbox.en.i18n +++ b/apps/toolbox.en.i18n @@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Millimeter" UnitDistanceMeterMicro = "Micrometer" UnitDistanceMeterNano = "Nanometer" UnitDistanceMeterPico = "Picometer" +UnitDistanceImperialMenu = "US Customary" +UnitDistanceInch = "Inch" +UnitDistanceFoot = "Foot" +UnitDistanceYard = "Yard" +UnitDistanceMile = "Mile" UnitDistanceAstronomicalUnit = "Astronomical unit" UnitDistanceLightYear = "Light year" UnitDistanceParsec = "Parsec" +UnitMassImperialMenu = "US Customary" +UnitMassPound = "Pound" +UnitMassOunce = "Ounce" +UnitMassTon = "US Ton" UnitMassMenu = "Mass" UnitMassGramKilo = "Kilogram" UnitMassGram = "Gram" diff --git a/apps/toolbox.es.i18n b/apps/toolbox.es.i18n index 52a63922a..b85f6bcd7 100644 --- a/apps/toolbox.es.i18n +++ b/apps/toolbox.es.i18n @@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Millimeter" UnitDistanceMeterMicro = "Micrometer" UnitDistanceMeterNano = "Nanometer" UnitDistanceMeterPico = "Picometer" +UnitDistanceImperialMenu = "US Customary" +UnitDistanceInch = "Inch" +UnitDistanceFoot = "Foot" +UnitDistanceYard = "Yard" +UnitDistanceMile = "Mile" UnitDistanceAstronomicalUnit = "Astronomical unit" UnitDistanceLightYear = "Light year" UnitDistanceParsec = "Parsec" +UnitMassImperialMenu = "US Customary" +UnitMassPound = "Pound" +UnitMassOunce = "Ounce" +UnitMassTon = "US Ton" UnitMassMenu = "Mass" UnitMassGramKilo = "Kilogram" UnitMassGram = "Gram" diff --git a/apps/toolbox.fr.i18n b/apps/toolbox.fr.i18n index bb9978e74..52c48f4fb 100644 --- a/apps/toolbox.fr.i18n +++ b/apps/toolbox.fr.i18n @@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Millimètre" UnitDistanceMeterMicro = "Micromètre" UnitDistanceMeterNano = "Nanomètre" UnitDistanceMeterPico = "Picomètre" +UnitDistanceImperialMenu = "US Customary" +UnitDistanceInch = "Inch" +UnitDistanceFoot = "Foot" +UnitDistanceYard = "Yard" +UnitDistanceMile = "Mile" UnitDistanceAstronomicalUnit = "Unité astronomique" UnitDistanceLightYear = "Année lumière" UnitDistanceParsec = "Parsec" +UnitMassImperialMenu = "US Customary" +UnitMassPound = "Pound" +UnitMassOunce = "Ounce" +UnitMassTon = "US Ton" UnitMassMenu = "Masse" UnitMassGramKilo = "Kilogramme" UnitMassGram = "Gramme" diff --git a/apps/toolbox.hu.i18n b/apps/toolbox.hu.i18n index d430669ac..a614c687b 100644 --- a/apps/toolbox.hu.i18n +++ b/apps/toolbox.hu.i18n @@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Milliméter" UnitDistanceMeterMicro = "Mikrométer" UnitDistanceMeterNano = "Nanométer" UnitDistanceMeterPico = "Pikométer" +UnitDistanceImperialMenu = "US Customary" +UnitDistanceInch = "Inch" +UnitDistanceFoot = "Foot" +UnitDistanceYard = "Yard" +UnitDistanceMile = "Mile" UnitDistanceAstronomicalUnit = "Csillagászati ​​egység" UnitDistanceLightYear = "Világos év" UnitDistanceParsec = "Parsec" +UnitMassImperialMenu = "US Customary" +UnitMassPound = "Pound" +UnitMassOunce = "Ounce" +UnitMassTon = "US Ton" UnitMassMenu = "Tömeg" UnitMassGramKilo = "Kilogram" UnitMassGram = "Gram" diff --git a/apps/toolbox.pt.i18n b/apps/toolbox.pt.i18n index 187e789f6..aa7cd713b 100644 --- a/apps/toolbox.pt.i18n +++ b/apps/toolbox.pt.i18n @@ -19,9 +19,18 @@ UnitDistanceMeterMilli = "Millimeter" UnitDistanceMeterMicro = "Micrometer" UnitDistanceMeterNano = "Nanometer" UnitDistanceMeterPico = "Picometer" +UnitDistanceImperialMenu = "US Customary" +UnitDistanceInch = "Inch" +UnitDistanceFoot = "Foot" +UnitDistanceYard = "Yard" +UnitDistanceMile = "Mile" UnitDistanceAstronomicalUnit = "Astronomical unit" UnitDistanceLightYear = "Light year" UnitDistanceParsec = "Parsec" +UnitMassImperialMenu = "US Customary" +UnitMassPound = "Pound" +UnitMassOunce = "Ounce" +UnitMassTon = "US Ton" UnitMassMenu = "Mass" UnitMassGramKilo = "Kilogram" UnitMassGram = "Gram" diff --git a/poincare/include/poincare/unit.h b/poincare/include/poincare/unit.h index 3b0716ae3..673b73921 100644 --- a/poincare/include/poincare/unit.h +++ b/poincare/include/poincare/unit.h @@ -255,6 +255,18 @@ public: Representative("pc", "180*60*60/π*_au", Representative::Prefixable::No, NoPrefix), + Representative("ft", "0.3048*_m", // used meters to allow for conversion + Representative::Prefixable::No, + NoPrefix), + Representative("in", "(1/12)*_ft", + Representative::Prefixable::No, + NoPrefix), + Representative("yd", "3*_ft", + Representative::Prefixable::No, + NoPrefix), + Representative("mi", "1760*_yd", + Representative::Prefixable::No, + NoPrefix), }, MassRepresentatives[] = { Representative("g", nullptr, @@ -266,6 +278,15 @@ public: Representative("Da", "(6.02214076*10^23*1000)^-1*_kg", Representative::Prefixable::Yes, NoPrefix), + Representative("lb", "453.59237*_g", + Representative::Prefixable::Yes, + NoPrefix), + Representative("oz", "(1/16)*_lb", + Representative::Prefixable::Yes, + NoPrefix), + Representative("ton", "2000*_lb", + Representative::Prefixable::Yes, + NoPrefix), }, CurrentRepresentatives[] = { Representative("A", nullptr, @@ -276,7 +297,6 @@ public: Representative("K", nullptr, Representative::Prefixable::No, NoPrefix), - }, AmountOfSubstanceRepresentatives[] = { Representative("mol", nullptr, Representative::Prefixable::Yes, From 97b756bc542dc996c28dd4920329cf8d3f730395 Mon Sep 17 00:00:00 2001 From: 0b101 <0b101@users.noreply.github.com> Date: Mon, 17 Feb 2020 08:56:25 -0600 Subject: [PATCH 002/830] Fixed error --- poincare/include/poincare/unit.h | 1 + 1 file changed, 1 insertion(+) diff --git a/poincare/include/poincare/unit.h b/poincare/include/poincare/unit.h index 673b73921..fd2eea28a 100644 --- a/poincare/include/poincare/unit.h +++ b/poincare/include/poincare/unit.h @@ -297,6 +297,7 @@ public: Representative("K", nullptr, Representative::Prefixable::No, NoPrefix), + }, AmountOfSubstanceRepresentatives[] = { Representative("mol", nullptr, Representative::Prefixable::Yes, From 207daa31bcd7c5b4a34c9bc3df4c661178fb5df2 Mon Sep 17 00:00:00 2001 From: David <0b101@users.noreply.github.com> Date: Mon, 17 Feb 2020 14:38:45 -0600 Subject: [PATCH 003/830] Update apps/toolbox.hu.i18n Co-Authored-By: Gegenter <36822415+Gegenter@users.noreply.github.com> --- apps/toolbox.hu.i18n | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/toolbox.hu.i18n b/apps/toolbox.hu.i18n index a614c687b..9303d0c28 100644 --- a/apps/toolbox.hu.i18n +++ b/apps/toolbox.hu.i18n @@ -19,7 +19,7 @@ UnitDistanceMeterMilli = "Milliméter" UnitDistanceMeterMicro = "Mikrométer" UnitDistanceMeterNano = "Nanométer" UnitDistanceMeterPico = "Pikométer" -UnitDistanceImperialMenu = "US Customary" +UnitDistanceImperialMenu = "Angolszász mértékegységek" UnitDistanceInch = "Inch" UnitDistanceFoot = "Foot" UnitDistanceYard = "Yard" From ef781d49d079206c9febddef118ba6e74205d71f Mon Sep 17 00:00:00 2001 From: David <0b101@users.noreply.github.com> Date: Mon, 17 Feb 2020 14:38:52 -0600 Subject: [PATCH 004/830] Update apps/toolbox.hu.i18n Co-Authored-By: Gegenter <36822415+Gegenter@users.noreply.github.com> --- apps/toolbox.hu.i18n | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/toolbox.hu.i18n b/apps/toolbox.hu.i18n index 9303d0c28..5c23649f4 100644 --- a/apps/toolbox.hu.i18n +++ b/apps/toolbox.hu.i18n @@ -20,7 +20,7 @@ UnitDistanceMeterMicro = "Mikrométer" UnitDistanceMeterNano = "Nanométer" UnitDistanceMeterPico = "Pikométer" UnitDistanceImperialMenu = "Angolszász mértékegységek" -UnitDistanceInch = "Inch" +UnitDistanceInch = "Hüvelyk" UnitDistanceFoot = "Foot" UnitDistanceYard = "Yard" UnitDistanceMile = "Mile" From 41999663aac0b725d3b4031844bb8dbf3dc3a6db Mon Sep 17 00:00:00 2001 From: David <0b101@users.noreply.github.com> Date: Mon, 17 Feb 2020 14:38:58 -0600 Subject: [PATCH 005/830] Update apps/toolbox.hu.i18n Co-Authored-By: Gegenter <36822415+Gegenter@users.noreply.github.com> --- apps/toolbox.hu.i18n | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/toolbox.hu.i18n b/apps/toolbox.hu.i18n index 5c23649f4..579fc6d85 100644 --- a/apps/toolbox.hu.i18n +++ b/apps/toolbox.hu.i18n @@ -21,7 +21,7 @@ UnitDistanceMeterNano = "Nanométer" UnitDistanceMeterPico = "Pikométer" UnitDistanceImperialMenu = "Angolszász mértékegységek" UnitDistanceInch = "Hüvelyk" -UnitDistanceFoot = "Foot" +UnitDistanceFoot = "Láb" UnitDistanceYard = "Yard" UnitDistanceMile = "Mile" UnitDistanceAstronomicalUnit = "Csillagászati ​​egység" From c18b9244edada5d389d5a8eeb9919e8ef9937560 Mon Sep 17 00:00:00 2001 From: David <0b101@users.noreply.github.com> Date: Mon, 17 Feb 2020 14:39:04 -0600 Subject: [PATCH 006/830] Update apps/toolbox.hu.i18n Co-Authored-By: Gegenter <36822415+Gegenter@users.noreply.github.com> --- apps/toolbox.hu.i18n | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/toolbox.hu.i18n b/apps/toolbox.hu.i18n index 579fc6d85..5ae813ea4 100644 --- a/apps/toolbox.hu.i18n +++ b/apps/toolbox.hu.i18n @@ -23,7 +23,7 @@ UnitDistanceImperialMenu = "Angolszász mértékegységek" UnitDistanceInch = "Hüvelyk" UnitDistanceFoot = "Láb" UnitDistanceYard = "Yard" -UnitDistanceMile = "Mile" +UnitDistanceMile = "Mérföld" UnitDistanceAstronomicalUnit = "Csillagászati ​​egység" UnitDistanceLightYear = "Világos év" UnitDistanceParsec = "Parsec" From b3e714f8ab47e45809e92f9efcf770f032e21145 Mon Sep 17 00:00:00 2001 From: David <0b101@users.noreply.github.com> Date: Mon, 17 Feb 2020 14:39:11 -0600 Subject: [PATCH 007/830] Update apps/toolbox.hu.i18n Co-Authored-By: Gegenter <36822415+Gegenter@users.noreply.github.com> --- apps/toolbox.hu.i18n | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/toolbox.hu.i18n b/apps/toolbox.hu.i18n index 5ae813ea4..8b647c58e 100644 --- a/apps/toolbox.hu.i18n +++ b/apps/toolbox.hu.i18n @@ -27,7 +27,7 @@ UnitDistanceMile = "Mérföld" UnitDistanceAstronomicalUnit = "Csillagászati ​​egység" UnitDistanceLightYear = "Világos év" UnitDistanceParsec = "Parsec" -UnitMassImperialMenu = "US Customary" +UnitMassImperialMenu = "Angolszász mértékegységek" UnitMassPound = "Pound" UnitMassOunce = "Ounce" UnitMassTon = "US Ton" From 513c3a8676eb2e31b2109e3bfa52c7f4e5f340bc Mon Sep 17 00:00:00 2001 From: David <0b101@users.noreply.github.com> Date: Mon, 17 Feb 2020 14:40:02 -0600 Subject: [PATCH 008/830] Update apps/toolbox.hu.i18n Co-Authored-By: Gegenter <36822415+Gegenter@users.noreply.github.com> --- apps/toolbox.hu.i18n | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/toolbox.hu.i18n b/apps/toolbox.hu.i18n index 8b647c58e..d277ca4c3 100644 --- a/apps/toolbox.hu.i18n +++ b/apps/toolbox.hu.i18n @@ -29,7 +29,7 @@ UnitDistanceLightYear = "Világos év" UnitDistanceParsec = "Parsec" UnitMassImperialMenu = "Angolszász mértékegységek" UnitMassPound = "Pound" -UnitMassOunce = "Ounce" +UnitMassOunce = "Uncia" UnitMassTon = "US Ton" UnitMassMenu = "Tömeg" UnitMassGramKilo = "Kilogram" From c456db337f595523562eb80003982b6db69a50ce Mon Sep 17 00:00:00 2001 From: David <0b101@users.noreply.github.com> Date: Mon, 17 Feb 2020 14:41:24 -0600 Subject: [PATCH 009/830] Update apps/toolbox.hu.i18n Co-Authored-By: Gegenter <36822415+Gegenter@users.noreply.github.com> --- apps/toolbox.hu.i18n | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/toolbox.hu.i18n b/apps/toolbox.hu.i18n index d277ca4c3..34380e3a0 100644 --- a/apps/toolbox.hu.i18n +++ b/apps/toolbox.hu.i18n @@ -30,7 +30,7 @@ UnitDistanceParsec = "Parsec" UnitMassImperialMenu = "Angolszász mértékegységek" UnitMassPound = "Pound" UnitMassOunce = "Uncia" -UnitMassTon = "US Ton" +UnitMassTon = "Amerikai tonna" UnitMassMenu = "Tömeg" UnitMassGramKilo = "Kilogram" UnitMassGram = "Gram" From 96723d8d994dea1ac80b8e2c8dae3a3d3cc69210 Mon Sep 17 00:00:00 2001 From: David <0b101@users.noreply.github.com> Date: Mon, 17 Feb 2020 14:41:32 -0600 Subject: [PATCH 010/830] Update apps/toolbox.hu.i18n Co-Authored-By: Gegenter <36822415+Gegenter@users.noreply.github.com> --- apps/toolbox.hu.i18n | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/toolbox.hu.i18n b/apps/toolbox.hu.i18n index 34380e3a0..fe0111876 100644 --- a/apps/toolbox.hu.i18n +++ b/apps/toolbox.hu.i18n @@ -28,7 +28,7 @@ UnitDistanceAstronomicalUnit = "Csillagászati ​​egység" UnitDistanceLightYear = "Világos év" UnitDistanceParsec = "Parsec" UnitMassImperialMenu = "Angolszász mértékegységek" -UnitMassPound = "Pound" +UnitMassPound = "Font" UnitMassOunce = "Uncia" UnitMassTon = "Amerikai tonna" UnitMassMenu = "Tömeg" From 1f8ae2dc88d5fbaba4f6092b058e202edff50a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Tue, 18 Feb 2020 21:30:05 +0100 Subject: [PATCH 011/830] Omega 1.20.0 --- apps/settings/sub_menu/about_controller.cpp | 2 +- build/config.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp index 8b0ab99ed..e5c816959 100644 --- a/apps/settings/sub_menu/about_controller.cpp +++ b/apps/settings/sub_menu/about_controller.cpp @@ -53,7 +53,7 @@ bool AboutController::handleEvent(Ion::Events::Event event) { if (childLabel == I18n::Message::CustomSoftwareVersion) { MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell(); if (strcmp(myCell->accessoryText(), Ion::customSoftwareVersion()) == 0) { - myCell->setAccessoryText("Public"); //Change for public/dev + myCell->setAccessoryText("Dev"); //Change for public/dev return true; } myCell->setAccessoryText(Ion::customSoftwareVersion()); diff --git a/build/config.mak b/build/config.mak index 3a2152112..9168085d4 100644 --- a/build/config.mak +++ b/build/config.mak @@ -7,7 +7,7 @@ include build/defaults.mak include build/platform.$(PLATFORM).mak EPSILON_VERSION ?= 13.0.0 -EPSILON_CUSTOM_VERSION ?= 1.19.0-0 +EPSILON_CUSTOM_VERSION ?= 1.20.0 # USERNAME ?= N/A EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings external EPSILON_I18N ?= en fr es de pt hu From 377ab54a5854329c509492270defe1e4aafcbf24 Mon Sep 17 00:00:00 2001 From: 0b101 <0b101@users.noreply.github.com> Date: Thu, 20 Feb 2020 15:45:54 -0600 Subject: [PATCH 012/830] Moved the result display settings to the math sub-menu --- apps/settings/main_controller.cpp | 2 +- apps/settings/main_controller.h | 5 ++--- apps/settings/main_controller_prompt_beta.cpp | 1 - apps/settings/main_controller_prompt_none.cpp | 1 - apps/settings/main_controller_prompt_update.cpp | 1 - apps/settings/sub_menu/math_options_controller.cpp | 2 ++ apps/settings/sub_menu/math_options_controller.h | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index be25f7b35..8b3264bb7 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -13,8 +13,8 @@ constexpr SettingsMessageTree s_modelEditionModeChildren[2] = {SettingsMessageTr constexpr SettingsMessageTree s_modelFloatDisplayModeChildren[4] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::Engineering), SettingsMessageTree(I18n::Message::SignificantFigures)}; constexpr SettingsMessageTree s_modelComplexFormatChildren[3] = {SettingsMessageTree(I18n::Message::Real), SettingsMessageTree(I18n::Message::Cartesian), SettingsMessageTree(I18n::Message::Polar)}; constexpr SettingsMessageTree s_symbolChildren[4] = {SettingsMessageTree(I18n::Message::SymbolMultiplicationCross),SettingsMessageTree(I18n::Message::SymbolMultiplicationMiddleDot),SettingsMessageTree(I18n::Message::SymbolMultiplicationStar),SettingsMessageTree(I18n::Message::SymbolMultiplicationAutoSymbol)}; -constexpr SettingsMessageTree s_modelMathOptionsChildren[5] = {SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren), SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren), SettingsMessageTree(I18n::Message::EditionMode, s_modelEditionModeChildren), SettingsMessageTree(I18n::Message::ComplexFormat, s_modelComplexFormatChildren), SettingsMessageTree(I18n::Message::SymbolMultiplication, s_symbolChildren)}; constexpr SettingsMessageTree s_modelResultDisplayChildren[2] = {SettingsMessageTree(I18n::Message::DefaultResult), SettingsMessageTree(I18n::Message::CompactResult)}; +constexpr SettingsMessageTree s_modelMathOptionsChildren[6] = {SettingsMessageTree(I18n::Message::AngleUnit, s_modelAngleChildren), SettingsMessageTree(I18n::Message::DisplayMode, s_modelFloatDisplayModeChildren), SettingsMessageTree(I18n::Message::EditionMode, s_modelEditionModeChildren), SettingsMessageTree(I18n::Message::ComplexFormat, s_modelComplexFormatChildren), SettingsMessageTree(I18n::Message::SymbolMultiplication, s_symbolChildren), SettingsMessageTree(I18n::Message::ResultDisplay, s_modelResultDisplayChildren)}; constexpr SettingsMessageTree s_modelFontChildren[2] = {SettingsMessageTree(I18n::Message::LargeFont), SettingsMessageTree(I18n::Message::SmallFont)}; constexpr SettingsMessageTree s_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)}; constexpr SettingsMessageTree s_contributorsChildren[16] = {SettingsMessageTree(I18n::Message::Developers), SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess), SettingsMessageTree(I18n::Message::David), SettingsMessageTree(I18n::Message::DamienNicolet), SettingsMessageTree(I18n::Message::EvannDreumont), SettingsMessageTree(I18n::Message::SzaboLevente), SettingsMessageTree(I18n::Message::VenceslasDuet), SettingsMessageTree(I18n::Message::BetaTesters), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::LouisC), SettingsMessageTree(I18n::Message::LelahelHideux)}; diff --git a/apps/settings/main_controller.h b/apps/settings/main_controller.h index 76be4f1d9..40a554a95 100644 --- a/apps/settings/main_controller.h +++ b/apps/settings/main_controller.h @@ -18,8 +18,8 @@ extern const SettingsMessageTree s_modelEditionModeChildren[2]; extern const SettingsMessageTree s_modelFloatDisplayModeChildren[4]; extern const SettingsMessageTree s_modelComplexFormatChildren[3]; extern const SettingsMessageTree s_symbolChildren[4]; -extern const SettingsMessageTree s_modelMathOptionsChildren[5]; extern const SettingsMessageTree s_modelResultDisplayChildren[2]; +extern const SettingsMessageTree s_modelMathOptionsChildren[6]; extern const SettingsMessageTree s_modelFontChildren[2]; extern const SettingsMessageTree s_accessibilityChildren[6]; extern const SettingsMessageTree s_contributorsChildren[16]; @@ -51,8 +51,7 @@ private: constexpr static int k_indexOfBrightnessCell = k_indexOfMathOptionsChildren + 1; constexpr static int k_indexOfLanguageCell = k_indexOfBrightnessCell + 1; constexpr static int k_indexOfExamModeCell = k_indexOfLanguageCell + 1; - constexpr static int k_indexOfResultDisplayCell = k_indexOfExamModeCell + 1; - constexpr static int k_indexOfFontCell = k_indexOfResultDisplayCell + 1; + constexpr static int k_indexOfFontCell = k_indexOfExamModeCell + 1; /* Pop-up cell and About cell are located at the same index because pop-up * cell is optional. We must always correct k_indexOfAboutCell with * hasPrompt() (TODO: make hasPrompt() constexpr and correct diff --git a/apps/settings/main_controller_prompt_beta.cpp b/apps/settings/main_controller_prompt_beta.cpp index f7546a2ce..8ee38839f 100644 --- a/apps/settings/main_controller_prompt_beta.cpp +++ b/apps/settings/main_controller_prompt_beta.cpp @@ -7,7 +7,6 @@ namespace Settings { constexpr SettingsMessageTree s_modelMenu[] = {SettingsMessageTree(I18n::Message::MathOptions, s_modelMathOptionsChildren), SettingsMessageTree(I18n::Message::Brightness), - SettingsMessageTree(I18n::Message::ResultDisplay, s_modelResultDisplayChildren), SettingsMessageTree(I18n::Message::FontSizes, s_modelFontChildren), SettingsMessageTree(I18n::Message::Language), SettingsMessageTree(I18n::Message::ExamMode, ExamModeConfiguration::s_modelExamChildren), diff --git a/apps/settings/main_controller_prompt_none.cpp b/apps/settings/main_controller_prompt_none.cpp index d382a0b11..ac670ab4c 100644 --- a/apps/settings/main_controller_prompt_none.cpp +++ b/apps/settings/main_controller_prompt_none.cpp @@ -9,7 +9,6 @@ constexpr SettingsMessageTree s_modelMenu[] = SettingsMessageTree(I18n::Message::Brightness), SettingsMessageTree(I18n::Message::Language), SettingsMessageTree(I18n::Message::ExamMode, ExamModeConfiguration::s_modelExamChildren), - SettingsMessageTree(I18n::Message::ResultDisplay, s_modelResultDisplayChildren), SettingsMessageTree(I18n::Message::FontSizes, s_modelFontChildren), SettingsMessageTree(I18n::Message::Accessibility, s_accessibilityChildren), SettingsMessageTree(I18n::Message::About, s_modelAboutChildren)}; diff --git a/apps/settings/main_controller_prompt_update.cpp b/apps/settings/main_controller_prompt_update.cpp index b7586d190..5ccbd1607 100644 --- a/apps/settings/main_controller_prompt_update.cpp +++ b/apps/settings/main_controller_prompt_update.cpp @@ -7,7 +7,6 @@ namespace Settings { constexpr SettingsMessageTree s_modelMenu[] = {SettingsMessageTree(I18n::Message::MathOptions, s_modelMathOptionsChildren), SettingsMessageTree(I18n::Message::Brightness), - SettingsMessageTree(I18n::Message::ResultDisplay, s_modelResultDisplayChildren), SettingsMessageTree(I18n::Message::FontSizes, s_modelFontChildren), SettingsMessageTree(I18n::Message::Language), SettingsMessageTree(I18n::Message::ExamMode, ExamModeConfiguration::s_modelExamChildren), diff --git a/apps/settings/sub_menu/math_options_controller.cpp b/apps/settings/sub_menu/math_options_controller.cpp index 5b4b42b7b..0657f1f51 100644 --- a/apps/settings/sub_menu/math_options_controller.cpp +++ b/apps/settings/sub_menu/math_options_controller.cpp @@ -66,6 +66,8 @@ void MathOptionsController::willDisplayCellForIndex(HighlightCell * cell, int in case I18n::Message::SymbolMultiplication: childIndex = (int)preferences->symbolofMultiplication(); break; + case I18n::Message::ResultDisplay: + childIndex = (int)preferences->resultDisplay(); default: break; } diff --git a/apps/settings/sub_menu/math_options_controller.h b/apps/settings/sub_menu/math_options_controller.h index 1db4c3104..b888d45b9 100644 --- a/apps/settings/sub_menu/math_options_controller.h +++ b/apps/settings/sub_menu/math_options_controller.h @@ -16,7 +16,7 @@ public: int reusableCellCount(int type) override; void willDisplayCellForIndex(HighlightCell * cell, int index) override; private: - constexpr static int k_totalNumberOfCell = 5; + constexpr static int k_totalNumberOfCell = 6; MessageTableCellWithChevronAndMessage m_cells[k_totalNumberOfCell]; PreferencesController m_preferencesController; DisplayModeController m_displayModeController; From 4d8a6488c4622056478b758a651ac15a7a354f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Fri, 21 Feb 2020 16:56:16 +0100 Subject: [PATCH 013/830] Simulator and web simulator renamed --- ion/src/simulator/shared/main_sdl.cpp | 4 ++-- ion/src/simulator/web/simulator.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ion/src/simulator/shared/main_sdl.cpp b/ion/src/simulator/shared/main_sdl.cpp index 014d452e9..98a78b5b9 100644 --- a/ion/src/simulator/shared/main_sdl.cpp +++ b/ion/src/simulator/shared/main_sdl.cpp @@ -87,7 +87,7 @@ void init() { if (argument_screen_only) { sWindow = SDL_CreateWindow( - "Epsilon", + "Omega", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, Ion::Display::Width, Ion::Display::Height, @@ -99,7 +99,7 @@ void init() { ); } else { sWindow = SDL_CreateWindow( - "Epsilon", + "Omega", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 290, 555, diff --git a/ion/src/simulator/web/simulator.html b/ion/src/simulator/web/simulator.html index 6a686c8de..06a66e6b0 100644 --- a/ion/src/simulator/web/simulator.html +++ b/ion/src/simulator/web/simulator.html @@ -4,7 +4,7 @@ - NumWorks graphing calculator + Omega