From 1f16ccb66124ee6ae80400a8567f80a91b781ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Mon, 4 Jun 2018 13:38:02 +0200
Subject: [PATCH] [solver] Change stack for approximate solutions

---
 apps/solver/base.de.i18n            | 1 +
 apps/solver/base.en.i18n            | 1 +
 apps/solver/base.es.i18n            | 1 +
 apps/solver/base.fr.i18n            | 1 +
 apps/solver/base.pt.i18n            | 1 +
 apps/solver/interval_controller.cpp | 6 +++---
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/solver/base.de.i18n b/apps/solver/base.de.i18n
index d73ba7b29..1b0ba2ecb 100644
--- a/apps/solver/base.de.i18n
+++ b/apps/solver/base.de.i18n
@@ -8,6 +8,7 @@ TooManyVariables = "Le système a trop d'inconnus"
 NonLinearSystem = "Le système n'est pas linéaire"
 Solution = "Solution"
 ApproximateSolution = "Solution approchée"
+SearchInverval = "Interval de recherche"
 NoSolution = "Le systeme n'admet aucune solution"
 InfiniteNumberOfSolutions = "Le systeme admet une infinite de solutions"
 ApproximateSolutionIntervalInstruction0= "Entrez l'intervalle dans lequel"
diff --git a/apps/solver/base.en.i18n b/apps/solver/base.en.i18n
index d73ba7b29..1b0ba2ecb 100644
--- a/apps/solver/base.en.i18n
+++ b/apps/solver/base.en.i18n
@@ -8,6 +8,7 @@ TooManyVariables = "Le système a trop d'inconnus"
 NonLinearSystem = "Le système n'est pas linéaire"
 Solution = "Solution"
 ApproximateSolution = "Solution approchée"
+SearchInverval = "Interval de recherche"
 NoSolution = "Le systeme n'admet aucune solution"
 InfiniteNumberOfSolutions = "Le systeme admet une infinite de solutions"
 ApproximateSolutionIntervalInstruction0= "Entrez l'intervalle dans lequel"
diff --git a/apps/solver/base.es.i18n b/apps/solver/base.es.i18n
index d73ba7b29..1b0ba2ecb 100644
--- a/apps/solver/base.es.i18n
+++ b/apps/solver/base.es.i18n
@@ -8,6 +8,7 @@ TooManyVariables = "Le système a trop d'inconnus"
 NonLinearSystem = "Le système n'est pas linéaire"
 Solution = "Solution"
 ApproximateSolution = "Solution approchée"
+SearchInverval = "Interval de recherche"
 NoSolution = "Le systeme n'admet aucune solution"
 InfiniteNumberOfSolutions = "Le systeme admet une infinite de solutions"
 ApproximateSolutionIntervalInstruction0= "Entrez l'intervalle dans lequel"
diff --git a/apps/solver/base.fr.i18n b/apps/solver/base.fr.i18n
index d73ba7b29..1b0ba2ecb 100644
--- a/apps/solver/base.fr.i18n
+++ b/apps/solver/base.fr.i18n
@@ -8,6 +8,7 @@ TooManyVariables = "Le système a trop d'inconnus"
 NonLinearSystem = "Le système n'est pas linéaire"
 Solution = "Solution"
 ApproximateSolution = "Solution approchée"
+SearchInverval = "Interval de recherche"
 NoSolution = "Le systeme n'admet aucune solution"
 InfiniteNumberOfSolutions = "Le systeme admet une infinite de solutions"
 ApproximateSolutionIntervalInstruction0= "Entrez l'intervalle dans lequel"
diff --git a/apps/solver/base.pt.i18n b/apps/solver/base.pt.i18n
index 59ac7543b..a42654af7 100644
--- a/apps/solver/base.pt.i18n
+++ b/apps/solver/base.pt.i18n
@@ -8,6 +8,7 @@ TooManyVariables = "Le système a trop d'inconnus"
 NonLinearSystem = "Le système n'est pas linéaire"
 Solution = "Solution"
 ApproximateSolution = "Solution approchée"
+SearchInverval = "Interval de recherche"
 NoSolution = "Le systeme n'admet aucune solution"
 InfiniteNumberOfSolutions = "Le systeme admet une infinite de solutions"
 ApproximateSolutionIntervalInstruction0= "Entrez l'intervalle dans lequel"
diff --git a/apps/solver/interval_controller.cpp b/apps/solver/interval_controller.cpp
index 98648b9e3..d60f34c68 100644
--- a/apps/solver/interval_controller.cpp
+++ b/apps/solver/interval_controller.cpp
@@ -1,5 +1,6 @@
 #include "interval_controller.h"
 #include "app.h"
+#include "../i18n.h"
 #include <assert.h>
 #include <string.h>
 
@@ -49,7 +50,7 @@ IntervalController::IntervalController(Responder * parentResponder, EquationStor
 }
 
 const char * IntervalController::title() {
-  return I18n::translate(I18n::Message::ApproximateSolution);
+  return I18n::translate(I18n::Message::SearchInverval);
 }
 
 int IntervalController::numberOfRows() {
@@ -96,8 +97,7 @@ bool IntervalController::textFieldDidFinishEditing(TextField * textField, const
 void IntervalController::buttonAction() {
   StackViewController * stack = stackController();
   App * solverApp = static_cast<App *>(app());
-  stack->pop();
-  stack->push(solverApp->solutionsControllerStack(), KDColorWhite, Palette::PurpleBright, Palette::PurpleBright);
+  stack->push(solverApp->solutionsControllerStack(), KDColorWhite, Palette::SubTab, Palette::SubTab);
 }
 
 I18n::Message IntervalController::okButtonText() {