[Feature] Made Compact Display the Default (#317)

* Made Compact Display the Default

* Made Input Field Slightly Smaller

* Removed Comma

* Fixed bug with x->a(x)

* Update escher/include/escher/expression_field.h

* Update escher/include/escher/expression_field.h
This commit is contained in:
David
2020-03-28 11:09:00 -05:00
committed by GitHub
parent 0ab6c53999
commit a7c62aa176
10 changed files with 11 additions and 11 deletions

View File

@@ -37,7 +37,7 @@ OmegaVersion = "Omega version"
Username = "Name"
MicroPythonVersion = "µPythonversion"
ResultDisplay = "Ergebniswiedergabe"
DefaultResult = "Standard "
DefaultResult = "Erweitert "
CompactResult = "Compact "
FontSizes = "Python Schriftgröße"
LargeFont = "Groß "

View File

@@ -37,7 +37,7 @@ OmegaVersion = "Omega version"
Username = "Name"
MicroPythonVersion = "µPython version"
ResultDisplay = "Result display"
DefaultResult = "Default "
DefaultResult = "Expanded "
CompactResult = "Compact "
FontSizes = "Python font size"
LargeFont = "Large "

View File

@@ -37,7 +37,7 @@ OmegaVersion = "Versión de Omega"
Username = "Apellido"
MicroPythonVersion = "Version de µPython"
ResultDisplay = "Visualización resultados"
DefaultResult = "Defecto "
DefaultResult = "Expandido "
CompactResult = "Compacto "
FontSizes = "Tipografía Python"
LargeFont = "Grande "

View File

@@ -37,7 +37,7 @@ OmegaVersion = "Version d'Omega"
Username = "Nom"
MicroPythonVersion = "Version de µPython"
ResultDisplay = "Mode d'affichage"
DefaultResult = "Défaut "
DefaultResult = "Étendue "
CompactResult = "Compact "
FontSizes = "Police Python"
LargeFont = "Grand "

View File

@@ -37,7 +37,7 @@ OmegaVersion = "Omega verzió"
Username = "Felhasználónév"
MicroPythonVersion = "µPython verzió"
ResultDisplay = "Eredménykijelzö"
DefaultResult = "Alapértelmezett "
DefaultResult = "Kiterjesztett "
CompactResult = "Kompakt "
FontSizes = "Python betü méret"
LargeFont = "Nagy "

View File

@@ -37,7 +37,7 @@ OmegaVersion = "Versão do Omega"
Username = "Nome"
MicroPythonVersion = "Versao do µPython"
ResultDisplay = "Exibição resultado"
DefaultResult = "Padrão "
DefaultResult = "Expandida "
CompactResult = "Compactar "
FontSizes = "Tipografia Python"
LargeFont = "Grande "

View File

@@ -14,7 +14,7 @@ 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_modelResultDisplayChildren[2] = {SettingsMessageTree(I18n::Message::DefaultResult), SettingsMessageTree(I18n::Message::CompactResult)};
constexpr SettingsMessageTree s_modelResultDisplayChildren[2] = {SettingsMessageTree(I18n::Message::CompactResult), SettingsMessageTree(I18n::Message::DefaultResult)};
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)};

View File

@@ -191,7 +191,7 @@ Layout PreferencesController::layoutForPreferences(I18n::Message message) {
}
case I18n::Message::CompactResult:
{
const char * text = "Beta";
const char * text = " ";
return LayoutHelper::String(text, strlen(text), k_layoutFont);
}

View File

@@ -53,8 +53,8 @@ public:
Auto = 3
};
enum class ResultDisplay : uint8_t {
Default = 0,
Compact = 1
Compact = 0,
Default = 1
};
enum class PythonFont : uint8_t {
Large = 0,

View File

@@ -15,7 +15,7 @@ Preferences::Preferences() :
m_numberOfSignificantDigits(PrintFloat::k_numberOfPrintedSignificantDigits),
m_colorOfLED(Preferences::LEDColor::Red),
m_symbolMultiplication(Preferences::SymbolMultiplication::Auto),
m_resultDisplay(Preferences::ResultDisplay::Default),
m_resultDisplay(Preferences::ResultDisplay::Compact),
m_pythonFont(Preferences::PythonFont::Large)
{}