[Revert] Compact display

apps/calculation/history_view_cell.h

@@ -49,7 +49,7 @@ public:
     return this;
   }
   Poincare::Layout layout() const override;
-  KDColor backgroundColor() const override { return m_even ? KDColorWhite : Palette::WallScreen; }
+  KDColor backgroundColor() const override { return m_even ? Palette::CalculationBackgroundEven : Palette::CalculationBackgroundOdd; }
   void resetMemoization();
   void setCalculation(Calculation * calculation, bool expanded);
   int numberOfSubviews() const override { return 2 + displayedEllipsis(); }

apps/settings/base.de.i18n

@@ -36,7 +36,6 @@ SoftwareVersion = "Epsilon version"
 OmegaVersion = "Omega version"
 Username = "Name"
 MicroPythonVersion = "µPythonversion"
-ResultDisplay = "Ergebniswiedergabe"
 DefaultResult = "Erweitert "
 CompactResult = "Compact "
 FontSizes = "Python-Schriftgröße"

apps/settings/base.en.i18n

@@ -36,7 +36,6 @@ SoftwareVersion = "Epsilon version"
 OmegaVersion = "Omega version"
 Username = "Name"
 MicroPythonVersion = "µPython version"
-ResultDisplay = "Result display"
 DefaultResult = "Expanded "
 CompactResult = "Compact "
 FontSizes = "Python font size"

apps/settings/base.es.i18n

@@ -36,7 +36,6 @@ SoftwareVersion = "Versión de Epsilon"
 OmegaVersion = "Versión de Omega"
 Username = "Apellido"
 MicroPythonVersion = "Version de µPython"
-ResultDisplay = "Visualización resultados"
 DefaultResult = "Expandido "
 CompactResult = "Compacto "
 FontSizes = "Tipografía Python"

apps/settings/base.fr.i18n

@@ -36,7 +36,6 @@ SoftwareVersion = "Version d'Epsilon"
 OmegaVersion = "Version d'Omega"
 Username = "Nom"
 MicroPythonVersion = "Version de µPython"
-ResultDisplay = "Mode d'affichage"
 DefaultResult = "Étendue "
 CompactResult = "Compact "
 FontSizes = "Police Python"

apps/settings/base.hu.i18n

@@ -36,7 +36,6 @@ SoftwareVersion = "Epsilon verzió"
 OmegaVersion = "Omega verzió"
 Username = "Felhasználónév"
 MicroPythonVersion = "µPython verzió"
-ResultDisplay = "Eredménykijelzö"
 DefaultResult = "Kiterjesztett "
 CompactResult = "Kompakt "
 FontSizes = "Python betü méret"

apps/settings/base.pt.i18n

@@ -36,7 +36,6 @@ SoftwareVersion = "Versão do Epsilon"
 OmegaVersion = "Versão do Omega"
 Username = "Nome"
 MicroPythonVersion = "Versao do µPython"
-ResultDisplay = "Exibição resultado"
 DefaultResult = "Expandida "
 CompactResult = "Compactar "
 FontSizes = "Tipografia Python"

apps/settings/main_controller.cpp

@@ -14,8 +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::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_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_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[17] = {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::CharlotteThomas), SettingsMessageTree(I18n::Message::BetaTesters), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::LouisC), SettingsMessageTree(I18n::Message::LelahelHideux)};

apps/settings/main_controller.h

@@ -18,8 +18,7 @@ extern const Shared::SettingsMessageTree s_modelEditionModeChildren[2];
 extern const Shared::SettingsMessageTree s_modelFloatDisplayModeChildren[4];
 extern const Shared::SettingsMessageTree s_modelComplexFormatChildren[3];
 extern const Shared::SettingsMessageTree s_symbolChildren[4];
-extern const Shared::SettingsMessageTree s_modelResultDisplayChildren[2];
-extern const Shared::SettingsMessageTree s_modelMathOptionsChildren[6];
+extern const Shared::SettingsMessageTree s_modelMathOptionsChildren[5];
 extern const Shared::SettingsMessageTree s_modelFontChildren[2];
 extern const Shared::SettingsMessageTree s_accessibilityChildren[6];
 extern const Shared::SettingsMessageTree s_contributorsChildren[17];

apps/settings/sub_menu/math_options_controller.cpp

@@ -66,8 +66,6 @@ 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;
   }

apps/settings/sub_menu/preferences_controller.cpp

@@ -244,12 +244,9 @@ void PreferencesController::setPreferenceWithValueIndex(I18n::Message message, i
     GlobalPreferences::sharedGlobalPreferences()->setTempExamMode((GlobalPreferences::ExamMode)((uint8_t)valueIndex + 1));
   } else if (message == I18n::Message::SymbolMultiplication) {
     preferences->setSymbolMultiplication((Preferences::SymbolMultiplication)valueIndex);
-  } else if (message == I18n::Message::ResultDisplay) {
-    preferences->setResultDisplay((Preferences::ResultDisplay)valueIndex);
   } else if (message == I18n::Message::FontSizes) {
     GlobalPreferences::sharedGlobalPreferences()->setFont(valueIndex == 0 ? KDFont::LargeFont : KDFont::SmallFont);
   }
-
 }
 
 int PreferencesController::valueIndexForPreference(I18n::Message message) const {
@@ -274,9 +271,6 @@ int PreferencesController::valueIndexForPreference(I18n::Message message) const
   if (message == I18n::Message::SymbolMultiplication) {
     return (int)preferences->symbolofMultiplication();
   }
-  if (message == I18n::Message::ResultDisplay) {
-    return (int)preferences->resultDisplay();
-  }
   if (message == I18n::Message::FontSizes) {
     return GlobalPreferences::sharedGlobalPreferences()->font() == KDFont::LargeFont ? 0 : 1;
   }

poincare/include/poincare/preferences.h

@@ -52,10 +52,6 @@ public:
     Star = 2,
     Auto = 3
   };
-  enum class ResultDisplay : uint8_t {
-    Compact = 0,
-    Default = 1
-  };
   enum class PythonFont : uint8_t {
     Large = 0,
     Small = 1
@@ -76,8 +72,6 @@ public:
   void setColorOfLED(LEDColor color) { m_colorOfLED = color; }
   SymbolMultiplication symbolofMultiplication() const { return m_symbolMultiplication; }
   void setSymbolMultiplication(SymbolMultiplication symbolofMultiplication) { m_symbolMultiplication = symbolofMultiplication; }
-  ResultDisplay resultDisplay() const { return m_resultDisplay; }
-  void setResultDisplay(ResultDisplay resultDisplay) { m_resultDisplay = resultDisplay; }
   PythonFont pythonFont() const { return m_pythonFont; }
   void setPythonFont(PythonFont pythonFont) { m_pythonFont = pythonFont; }
   const KDFont * KDPythonFont() const { return (m_pythonFont == PythonFont::Small) ? KDFont::SmallFont : KDFont::LargeFont; }
@@ -89,7 +83,6 @@ private:
   uint8_t m_numberOfSignificantDigits;
   LEDColor m_colorOfLED;
   SymbolMultiplication m_symbolMultiplication;
-  ResultDisplay m_resultDisplay;
   PythonFont m_pythonFont;
 };
 

poincare/src/preferences.cpp

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