diff --git a/apps/variable_box_empty_controller.cpp b/apps/variable_box_empty_controller.cpp index 6882081e7..7e56f0538 100644 --- a/apps/variable_box_empty_controller.cpp +++ b/apps/variable_box_empty_controller.cpp @@ -10,19 +10,19 @@ using namespace Ion; VariableBoxEmptyController::VariableBoxEmptyView::VariableBoxEmptyView() : m_layoutExample(0.5f, 0.5f, KDColorBlack, Palette::WallScreen) { - I18n::Message messages[k_numberOfMessages] = {I18n::Message::EmptyVariableBox0, I18n::Message::Default, I18n::Message::EmptyVariableBox1, I18n::Message::EmptyVariableBox2, I18n::Message::EmptyVariableBox3}; for (int i = 0; i < k_numberOfMessages; i++) { m_messages[i].setFont(k_font); m_messages[i].setAlignment(0.5f, 0.5f); m_messages[i].setBackgroundColor(Palette::WallScreen); - m_messages[i].setMessage(messages[i]); } m_messages[0].setAlignment(0.5f,1.0f); m_messages[k_numberOfMessages-1].setAlignment(0.5f,0.0f); } -void VariableBoxEmptyController::VariableBoxEmptyView::setMessage(I18n::Message message) { - m_messages[1].setMessage(message); +void VariableBoxEmptyController::VariableBoxEmptyView::setMessages(I18n::Message * message) { + for (int i = 0; i < k_numberOfMessages; i++) { + m_messages[i].setMessage(message[i]); + } } void VariableBoxEmptyController::VariableBoxEmptyView::setLayout(Poincare::Layout layout) { @@ -49,7 +49,7 @@ void VariableBoxEmptyController::VariableBoxEmptyView::layoutSubviews() { KDCoordinate textHeight = k_font->glyphSize().height(); KDCoordinate layoutHeight = m_layoutExample.minimalSizeForOptimalDisplay().height(); KDCoordinate margin = (height - k_numberOfMessages*textHeight-layoutHeight)/2; - m_layoutExample.setFrame(KDRect(0, margin+3*textHeight, width, layoutHeight)); + m_layoutExample.setFrame(KDRect(0, margin+k_layoutRowIndex*textHeight, width, layoutHeight)); KDCoordinate currentHeight = 0; for (uint8_t i = 0; i < k_numberOfMessages; i++) { if (i == k_layoutRowIndex) { @@ -76,19 +76,23 @@ void VariableBoxEmptyController::viewDidDisappear() { } void VariableBoxEmptyController::setType(Type type) { - I18n::Message message = I18n::Message::Default; + I18n::Message messages[VariableBoxEmptyView::k_numberOfMessages] = {I18n::Message::Default, I18n::Message::Default, I18n::Message::Default, I18n::Message::EnableCharacters}; Layout layout; switch (type) { case Type::Expressions: { - message = I18n::Message::EmptyExpressionBox; + messages[0] = I18n::Message::EmptyExpressionBox0; + messages[1] = I18n::Message::EmptyExpressionBox1; + messages[2] = I18n::Message::EmptyExpressionBox2; char storeExpression[] = {'3', Ion::Charset::Sto, 'A', 0}; layout = LayoutHelper::String(storeExpression, sizeof(storeExpression)-1, VariableBoxEmptyView::k_font); break; } case Type::Functions: { - message = I18n::Message::EmptyFunctionBox; + messages[0] = I18n::Message::EmptyFunctionBox0; + messages[1] = I18n::Message::EmptyFunctionBox1; + messages[2] = I18n::Message::EmptyFunctionBox2; char storeFunction[] = {'3', '+', Graph::StorageCartesianFunctionStore::Symbol(), Ion::Charset::Sto, 'f', '(', Graph::StorageCartesianFunctionStore::Symbol(), ')', 0}; layout = LayoutHelper::String(storeFunction, sizeof(storeFunction)-1, VariableBoxEmptyView::k_font); break; @@ -96,6 +100,6 @@ void VariableBoxEmptyController::setType(Type type) { default: assert(false); } - m_view.setMessage(message); + m_view.setMessages(messages); m_view.setLayout(layout); } diff --git a/apps/variable_box_empty_controller.h b/apps/variable_box_empty_controller.h index a42c6cd01..b799c6ca9 100644 --- a/apps/variable_box_empty_controller.h +++ b/apps/variable_box_empty_controller.h @@ -22,14 +22,14 @@ private: public: static constexpr const KDFont * k_font = KDFont::SmallFont; VariableBoxEmptyView(); - void setMessage(I18n::Message message); + void setMessages(I18n::Message * message); void setLayout(Poincare::Layout layout); + constexpr static int k_numberOfMessages = 4; private: int numberOfSubviews() const override; View * subviewAtIndex(int index) override; void layoutSubviews() override; - constexpr static int k_numberOfMessages = 5; - constexpr static int k_layoutRowIndex = 3; + constexpr static int k_layoutRowIndex = 2; MessageTextView m_messages[k_numberOfMessages]; ExpressionView m_layoutExample; }; diff --git a/apps/variables.de.i18n b/apps/variables.de.i18n index e4df7135b..ffe0c55c7 100644 --- a/apps/variables.de.i18n +++ b/apps/variables.de.i18n @@ -1,9 +1,10 @@ Variables = "Variablen" Expressions = "Expressions" Functions = "Funktions" -EmptyVariableBox0 = "Sie haben keine" -EmptyFunctionBox = "Funktion definiert." -EmptyExpressionBox = "Variable definiert." -EmptyVariableBox1 = "Um eine zu definieren:" -EmptyVariableBox2 = "Erlaubte Zeichen im namen:" -EmptyVariableBox3 = "A..Z, a..z, 0..9 und _" +EmptyExpressionBox0 = "Sie haben keine Variable definiert." +EmptyFunctionBox0 = "Sie haben keine Funktion definiert." +EmptyExpressionBox1 = "Um eine Variable zu definieren:" +EmptyFunctionBox1 = "Um eine Funktion zu definieren:" +EmptyExpressionBox2 = "Erlaubte Zeichen im namen:" +EmptyFunctionBox2 = "Erlaubte Zeichen im namen:" +EnableCharacters = "A..Z, a..z, 0..9 und _" diff --git a/apps/variables.en.i18n b/apps/variables.en.i18n index d409a6f5d..5c8aa8ef6 100644 --- a/apps/variables.en.i18n +++ b/apps/variables.en.i18n @@ -1,9 +1,10 @@ Variables = "Variables" Expressions = "Expressions" Functions = "Functions" -EmptyVariableBox0 = "You have not defined any" -EmptyFunctionBox = "function." -EmptyExpressionBox = "variable expression." -EmptyVariableBox1 = "To do so, you can enter:" -EmptyVariableBox2 = "Variable names can contain:" -EmptyVariableBox3 = "A..Z, a..z, 0..9 and _" +EmptyExpressionBox0 = "You have not defined any variables." +EmptyFunctionBox0 = "You have not defined any functions." +EmptyExpressionBox1 = "To define a variable, type:" +EmptyFunctionBox1 = "To define a function, type:" +EmptyExpressionBox2 = "The variable name can contain:" +EmptyFunctionBox2 = "The function name can contain:" +EnableCharacters = "A..Z, a..z, 0..9 and _" diff --git a/apps/variables.es.i18n b/apps/variables.es.i18n index 11eb58d4c..b0e00b9ba 100644 --- a/apps/variables.es.i18n +++ b/apps/variables.es.i18n @@ -1,9 +1,10 @@ Variables = "Variables" Expressions = "Expresiones" Functions = "Funciones" -EmptyVariableBox0 = "No definió ninguna" -EmptyFunctionBox = "función." -EmptyExpressionBox = "Expression variable." -EmptyVariableBox1 = "Para definir uno, puede escribir:" -EmptyVariableBox2 = "Nombre de variables pueden contener:" -EmptyVariableBox3 = "A..Z, a..z, 0..9 y _" +EmptyExpressionBox0 = "Ninguna variable definida." +EmptyFunctionBox0 = "Ninguna función definida." +EmptyExpressionBox1 = "Para definir una, teclear :" +EmptyFunctionBox1 = "Para definir una, teclear :" +EmptyExpressionBox2 = "El nombre de variable debe contener :" +EmptyFunctionBox2 = "El nombre de función debe contener : " +EnableCharacters = "A..Z, a..z, 0..9 y _" diff --git a/apps/variables.fr.i18n b/apps/variables.fr.i18n index 54c9cdf37..a94262cb5 100644 --- a/apps/variables.fr.i18n +++ b/apps/variables.fr.i18n @@ -1,9 +1,10 @@ Variables = "Variables" Expressions = "Expressions" Functions = "Fonctions" -EmptyVariableBox0 = "Vous n'avez défini aucune" -EmptyFunctionBox = "fonction." -EmptyExpressionBox = "variable." -EmptyVariableBox1 = "Pour en définir une, tapez :" -EmptyVariableBox2 = "Le nom de la variable peut contenir :" -EmptyVariableBox3 = "A..Z, a..z, 0..9 and _" +EmptyExpressionBox0 = "Vous n'avez défini aucune variable." +EmptyFunctionBox0 = "Vous n'avez défini aucune fonction." +EmptyExpressionBox1 = "Pour définir une variable, tapez :" +EmptyFunctionBox1 = "Pour définir une fonction, tapez :" +EmptyExpressionBox2 = "Le nom de la variable peut contenir :" +EmptyFunctionBox2 = "Le nom de la fonction peut contenir :" +EnableCharacters = "A..Z, a..z, 0..9 et _" diff --git a/apps/variables.pt.i18n b/apps/variables.pt.i18n index a8e9fd722..64ea198b0 100644 --- a/apps/variables.pt.i18n +++ b/apps/variables.pt.i18n @@ -1,9 +1,10 @@ Variables = "Variaveis" Expressions = "Expressões" Functions = "Funçães" -EmptyVariableBox0 = "Não definiu nenhuma" -EmptyFunctionBox = "função." -EmptyExpressionBox = "variável." -EmptyVariableBox1 = "Definir um, tipo:" -EmptyVariableBox2 = "Os nomes de variáveis podem conter:" -EmptyVariableBox3 = "A..Z, a..z, 0..9 e _" +EmptyExpressionBox0 = "Nenhuma variável definida." +EmptyFunctionBox0 = "Nenhuma função definida." +EmptyExpressionBox1 = "Para definir uma, digite :" +EmptyFunctionBox1 = "Para definir uma, digite :" +EmptyExpressionBox2 = "O nome da variável pode conter:" +EmptyFunctionBox2 = "O nome da função pode conter:" +EnableCharacters = "A..Z, a..z, 0..9 y _"