[apps/shared] Change Zoom button in curves

Zoom is now called navigate, and its button is placed before the Axes
button.

Change-Id: Ied194c20438e573a237ce36f221b9be87cfd4bab

apps/shared.de.i18n

@@ -55,6 +55,7 @@ Move = " Verschieben: "
 NameCannotStartWithNumber = "Ein Name darf nicht mit einer Zahl beginnen"
 NameTaken = "Dieser Name ist bereits vergeben"
 NameTooLong = "Der Name ist zu lang"
+Navigate = "Navigieren"
 NEnd = "N Endwert"
 Next = "Nächste"
 NoDataToPlot = "Keine Daten zum Zeichnen"

apps/shared.en.i18n

@@ -55,6 +55,7 @@ Move = " Move: "
 NameCannotStartWithNumber = "A name cannot start with a number"
 NameTaken = "This name has already been taken"
 NameTooLong = "This name is too long"
+Navigate = "Navigate"
 Next = "Next"
 NoDataToPlot = "No data to draw"
 NoFunctionToDelete = "No function to delete"

apps/shared.es.i18n

@@ -55,6 +55,7 @@ Move = " Mover : "
 NameCannotStartWithNumber = "Un nombre no puede empezar con un número"
 NameTaken = "Este nombre ya está en uso"
 NameTooLong = "Este nombre es demasiado largo"
+Navigate = "Navegar"
 NEnd = "N fin"
 Next = "Siguiente"
 NoDataToPlot = "Ningunos datos que dibujar"

apps/shared.fr.i18n

@@ -55,6 +55,7 @@ Move = " Déplacer : "
 NameCannotStartWithNumber = "Un nom ne peut pas commencer par un chiffre"
 NameTaken = "Ce nom est déjà utilisé"
 NameTooLong = "Ce nom est trop long"
+Navigate = "Naviguer"
 Next = "Suivant"
 NEnd = "N fin"
 NoDataToPlot = "Aucune donnée à tracer"

apps/shared.it.i18n

@@ -55,6 +55,7 @@ Move = " Spostare : "
 NameCannotStartWithNumber = "Un nome non può cominciare con un numero"
 NameTaken = "Questo nome è già utilizzato"
 NameTooLong = "Questo nome è troppo lungo"
+Navigate = "Navigare"
 Next = "Successivo"
 NEnd = "N finale"
 NoDataToPlot = "Nessun dato da tracciare"

apps/shared.nl.i18n

@@ -55,6 +55,7 @@ Move = " Verplaats: "
 NameCannotStartWithNumber = "Een naam kan niet beginnen met een nummer"
 NameTaken = "Deze naam is al in gebruik"
 NameTooLong = "Deze naam is te lang"
+Navigate = "Bladeren"
 Next = "Volgende"
 NoDataToPlot = "Geen gegevens om te plotten"
 NoFunctionToDelete = "Geen functie om te verwijderen"

apps/shared.pt.i18n

@@ -55,6 +55,7 @@ Move = " Mover : "
 NameCannotStartWithNumber = "O nome não pode começar com um número"
 NameTaken = "Este nome já está a ser usado"
 NameTooLong = "Este nome é muito longo"
+Navigate = "Navegar"
 NEnd = "N fim"
 Next = "Seguinte"
 NoDataToPlot = "Não há dados para desenhar"

apps/shared.universal.i18n

@@ -191,4 +191,3 @@ X = "x"
 YMax = "Ymax"
 YMin = "Ymin"
 Y = "y"
-Zoom = "Zoom"

apps/shared/interactive_curve_view_controller.cpp

@@ -25,17 +25,17 @@ InteractiveCurveViewController::InteractiveCurveViewController(Responder * paren
     graphController->normalizeButtonAction();
     return true;
   }, this), KDFont::SmallFont),
+  m_zoomButton(this, I18n::Message::Navigate, Invocation([](void * context, void * sender) {
+    InteractiveCurveViewController * graphController = (InteractiveCurveViewController *) context;
+    graphController->navigationButtonAction();
+    return true;
+  }, this), KDFont::SmallFont),
   m_rangeButton(this, I18n::Message::Axis, Invocation([](void * context, void * sender) {
     InteractiveCurveViewController * graphController = (InteractiveCurveViewController *) context;
     graphController->rangeParameterController()->setRange(graphController->interactiveRange());
     StackViewController * stack = graphController->stackController();
     stack->push(graphController->rangeParameterController());
     return true;
-  }, this), KDFont::SmallFont),
-  m_zoomButton(this, I18n::Message::Zoom, Invocation([](void * context, void * sender) {
-    InteractiveCurveViewController * graphController = (InteractiveCurveViewController *) context;
-    graphController->navigationButtonAction();
-    return true;
   }, this), KDFont::SmallFont)
 {
 }
@@ -138,7 +138,7 @@ int InteractiveCurveViewController::numberOfButtons(ButtonRowController::Positio
 }
 
 Button * InteractiveCurveViewController::buttonAtIndex(int index, ButtonRowController::Position position) const {
-  const Button * buttons[] = {&m_autoButton, &m_normalizeButton, &m_rangeButton, &m_zoomButton};
+  const Button * buttons[] = {&m_autoButton, &m_normalizeButton, &m_zoomButton, &m_rangeButton};
   return (Button *)buttons[index];
 }
 

apps/shared/interactive_curve_view_controller.h

@@ -80,8 +80,8 @@ private:
   InteractiveCurveViewRange * m_interactiveRange;
   Button m_autoButton;
   Button m_normalizeButton;
-  Button m_rangeButton;
   Button m_zoomButton;
+  Button m_rangeButton;
 };
 
 }

apps/shared/zoom_parameter_controller.cpp

@@ -12,7 +12,7 @@ ZoomParameterController::ZoomParameterController(Responder * parentResponder, In
 }
 
 const char * ZoomParameterController::title() {
-  return I18n::translate(I18n::Message::Zoom);
+  return I18n::translate(I18n::Message::Navigate);
 }
 
 void ZoomParameterController::viewWillAppear() {