diff --git a/apps/apps_container.cpp b/apps/apps_container.cpp index 60c8f910e..b83e373ff 100644 --- a/apps/apps_container.cpp +++ b/apps/apps_container.cpp @@ -56,7 +56,7 @@ bool AppsContainer::handleEvent(Ion::Events::Event event) { } void AppsContainer::switchTo(App * app) { - m_window.setTitle(app->name()); + m_window.setTitle(app->upperName()); // TODO: Update the battery icon every in a time frame m_window.updateBatteryLevel(); Container::switchTo(app); diff --git a/apps/calculation/app.cpp b/apps/calculation/app.cpp index bcee5708c..aa703240b 100644 --- a/apps/calculation/app.cpp +++ b/apps/calculation/app.cpp @@ -4,7 +4,7 @@ namespace Calculation { App::App(Container * container, Context * context) : - TextFieldDelegateApp(container, &m_editExpressionController, "Calcul", ImageStore::CalculationIcon), + TextFieldDelegateApp(container, &m_editExpressionController, "Calculs", "CALCULS", ImageStore::CalculationIcon), m_localContext(LocalContext((GlobalContext *)context, &m_calculationStore)), m_calculationStore(CalculationStore()), m_historyController(HistoryController(&m_editExpressionController, &m_calculationStore)), diff --git a/apps/graph/app.cpp b/apps/graph/app.cpp index 75f91d80b..47fa01593 100644 --- a/apps/graph/app.cpp +++ b/apps/graph/app.cpp @@ -4,7 +4,7 @@ namespace Graph { App::App(Container * container, Context * context) : - TextFieldDelegateApp(container, &m_inputViewController, "Graph", ImageStore::GraphIcon), + TextFieldDelegateApp(container, &m_inputViewController, "Fonctions", "FONCTIONS", ImageStore::GraphIcon), m_functionStore(FunctionStore()), m_xContext(XContext(context)), m_listController(ListController(&m_listHeader, &m_functionStore, &m_listHeader)), diff --git a/apps/home/app.cpp b/apps/home/app.cpp index 27964c2c0..f4b00cec5 100644 --- a/apps/home/app.cpp +++ b/apps/home/app.cpp @@ -7,7 +7,7 @@ extern "C" { namespace Home { App::App(AppsContainer * container) : - ::App(container, &m_controller, "Applications"), + ::App(container, &m_controller, "Applications", "APPLICATIONS"), m_controller(Controller(&m_modalViewController, container)) { assert(container->appAtIndex(0) == this); diff --git a/apps/probability/app.cpp b/apps/probability/app.cpp index ea0267da9..816510d30 100644 --- a/apps/probability/app.cpp +++ b/apps/probability/app.cpp @@ -4,7 +4,7 @@ namespace Probability { App::App(Container * container) : - TextFieldDelegateApp(container, &m_stackViewController, "Probability", ImageStore::ProbabilityIcon), + TextFieldDelegateApp(container, &m_stackViewController, "Probabilites", "PROBABILITES", ImageStore::ProbabilityIcon), m_lawController(LawController(nullptr)), m_stackViewController(&m_modalViewController, &m_lawController, true) { diff --git a/apps/regression/app.cpp b/apps/regression/app.cpp index 6cc4b2d74..1519e972e 100644 --- a/apps/regression/app.cpp +++ b/apps/regression/app.cpp @@ -4,7 +4,7 @@ namespace Regression { App::App(Container * container) : - TextFieldDelegateApp(container, &m_tabViewController, "Resgression", ImageStore::RegressionIcon), + TextFieldDelegateApp(container, &m_tabViewController, "Regression", "REGRESSION", ImageStore::RegressionIcon), m_store(), m_calculationController(CalculationController(&m_calculationAlternateEmptyViewController, &m_calculationHeader, &m_store)), m_calculationAlternateEmptyViewController(AlternateEmptyViewController(&m_calculationHeader, &m_calculationController, &m_calculationController)), diff --git a/apps/statistics/app.cpp b/apps/statistics/app.cpp index 66e7c24ab..d015d5a5e 100644 --- a/apps/statistics/app.cpp +++ b/apps/statistics/app.cpp @@ -4,7 +4,7 @@ namespace Statistics { App::App(Container * container) : - TextFieldDelegateApp(container, &m_tabViewController, "Statistics", ImageStore::StatIcon), + TextFieldDelegateApp(container, &m_tabViewController, "Statistiques", "STATISTIQUES", ImageStore::StatIcon), m_store(), m_calculationController(CalculationController(&m_calculationAlternateEmptyViewController, &m_calculationHeader, &m_store)), m_calculationAlternateEmptyViewController(AlternateEmptyViewController(&m_calculationHeader, &m_calculationController, &m_calculationController)), diff --git a/apps/text_field_delegate_app.cpp b/apps/text_field_delegate_app.cpp index d42daf566..64a645a02 100644 --- a/apps/text_field_delegate_app.cpp +++ b/apps/text_field_delegate_app.cpp @@ -1,9 +1,9 @@ #include "text_field_delegate_app.h" #include "apps_container.h" -TextFieldDelegateApp::TextFieldDelegateApp(Container * container, ViewController * rootViewController, const char * name - , const Image * icon) : - ::App(container, rootViewController, name, icon), +TextFieldDelegateApp::TextFieldDelegateApp(Container * container, ViewController * rootViewController, const char * name, + const char * upperName, const Image * icon) : + ::App(container, rootViewController, name, upperName, icon), ExpressionTextFieldDelegate() { } diff --git a/apps/text_field_delegate_app.h b/apps/text_field_delegate_app.h index 38f58ba5d..fb15d292c 100644 --- a/apps/text_field_delegate_app.h +++ b/apps/text_field_delegate_app.h @@ -6,7 +6,7 @@ class TextFieldDelegateApp : public ::App, public ExpressionTextFieldDelegate { public: - TextFieldDelegateApp(Container * container, ViewController * rootViewController, const char * name = nullptr, const Image * icon = nullptr); + TextFieldDelegateApp(Container * container, ViewController * rootViewController, const char * name = nullptr, const char * upperName = nullptr, const Image * icon = nullptr); virtual Context * localContext() override; }; diff --git a/escher/include/escher/app.h b/escher/include/escher/app.h index 03d8ab4b2..f6111a682 100644 --- a/escher/include/escher/app.h +++ b/escher/include/escher/app.h @@ -21,7 +21,7 @@ class Container; class App : public Responder { public: constexpr static uint8_t Magic = 0xA8; - App(Container * container, ViewController * rootViewController, const char * name = nullptr, const Image * icon = nullptr); + App(Container * container, ViewController * rootViewController, const char * name = nullptr, const char * upperName = nullptr, const Image * icon = nullptr); void setWindow(Window * window); void setFirstResponder(Responder * responder); Responder * firstResponder(); @@ -32,6 +32,7 @@ public: void displayWarning(const char * warningMessage); const Container * container() const; const char * name(); + const char * upperName(); const Image * icon(); uint8_t m_magic; // Poor man's RTTI protected: @@ -41,6 +42,7 @@ private: Responder * m_firstResponder; WarningController m_warningController; const char * m_name; + const char * m_upperName; const Image * m_icon; }; diff --git a/escher/src/app.cpp b/escher/src/app.cpp index 22ce50fb9..b88789ed4 100644 --- a/escher/src/app.cpp +++ b/escher/src/app.cpp @@ -4,7 +4,7 @@ extern "C" { #include } -App::App(Container * container, ViewController * rootViewController, const char * name, const Image * icon) : +App::App(Container * container, ViewController * rootViewController, const char * name, const char * upperName, const Image * icon) : Responder(nullptr), m_magic(Magic), m_modalViewController(ModalViewController(this, rootViewController)), @@ -12,6 +12,7 @@ App::App(Container * container, ViewController * rootViewController, const char m_firstResponder(nullptr), m_warningController(WarningController(this)), m_name(name), + m_upperName(upperName), m_icon(icon) { } @@ -58,6 +59,10 @@ const char * App::name() { return m_name; } +const char * App::upperName() { + return m_upperName; +} + const Image * App::icon() { return m_icon; }