Merge branch 'omega-dev' of https://github.com/M4xi1m3/Omega into M4xi1m3-omega-dev

apps/settings/sub_menu/exam_mode_controller.cpp

@@ -28,6 +28,8 @@ bool ExamModeController::handleEvent(Ion::Events::Event event) {
   I18n::Message childLabel = m_messageTreeModel->children(selectedRow())->label();
   if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) {
     if (GlobalPreferences::sharedGlobalPreferences()->examMode()) {
+      if (childLabel == I18n::Message::ActivateExamMode || childLabel == I18n::Message::ExamModeActive)
+        AppsContainer::sharedAppsContainer()->displayExamModePopUp(true);
       return true;
     }
     if (childLabel == I18n::Message::ActivateExamMode || childLabel == I18n::Message::ExamModeActive) {

apps/shared.de.i18n

@@ -61,6 +61,7 @@ StorageMemoryFull1 = "Der Speicher ist voll. Löschen Sie"
 StorageMemoryFull2 = "von Daten und versuchen Sie es erneut."
 StoreExpressionNotAllowed = "'store' ist verboten"
 SyntaxError = "Syntaxfehler"
+Sym = "sym"
 TEnd = "T Endwert"
 ThetaEnd = "θ Endwert"
 ThetaStart = "θ Startwert"

apps/shared.en.i18n

@@ -61,6 +61,7 @@ Step = "Step"
 StorageMemoryFull1 = "The memory is full."
 StorageMemoryFull2 = "Erase data and try again."
 SyntaxError = "Syntax error"
+Sym = "sym"
 TEnd = "T end"
 ThetaEnd = "θ end"
 ThetaStart = "θ start"

apps/shared.es.i18n

@@ -61,6 +61,7 @@ StorageMemoryFull1 = "La memoria está llena."
 StorageMemoryFull2 = "Borre datos e intente de nuevo."
 StoreExpressionNotAllowed = "'store' no está permitido"
 SyntaxError = "Error sintáctico"
+Sym = "sim"
 TEnd = "T fin"
 ThetaEnd = "θ fin"
 ThetaStart = "θ inicio"

apps/shared.fr.i18n

@@ -61,6 +61,7 @@ StorageMemoryFull1 = "La mémoire est pleine."
 StorageMemoryFull2 = "Effacez des données et réessayez."
 StoreExpressionNotAllowed = "'store' n'est pas autorisé"
 SyntaxError = "Attention à la syntaxe"
+Sym = "sym"
 TEnd = "T fin"
 ThetaEnd = "θ fin"
 ThetaStart = "θ début"

apps/shared.pt.i18n

@@ -61,6 +61,7 @@ StorageMemoryFull1 = "A memoria esta cheia."
 StorageMemoryFull2 = "Apage dados e tente novamente."
 StoreExpressionNotAllowed = "'store' não está permitido"
 SyntaxError = "Erro de sintaxe"
+Sym = "sim"
 TEnd = "T fim"
 ThetaEnd = "θ fim"
 ThetaStart = "θ inicio"

apps/title_bar_view.cpp

@@ -85,6 +85,14 @@ void TitleBarView::refreshPreferences() {
   char buffer[bufferSize];
   int numberOfChar = 0;
   Preferences * preferences = Preferences::sharedPreferences();
+  if (GlobalPreferences::sharedGlobalPreferences()->examMode() && Preferences::sharedPreferences()->isExamSymbolic()) {
+    // Display "cas" if in exam mode with symbolic computation enabled
+      numberOfChar += strlcpy(buffer+numberOfChar, I18n::translate(I18n::Message::Sym), bufferSize - numberOfChar);
+      assert(numberOfChar < bufferSize-1);
+      assert(UTF8Decoder::CharSizeOfCodePoint('/') == 1);
+      buffer[numberOfChar++] = '/';
+  }
+  assert(numberOfChar <= bufferSize);
   {
     // Display Sci/ or Eng/ if the print float mode is not decimal
     const Preferences::PrintFloatMode printFloatMode = preferences->displayMode();
@@ -93,7 +101,7 @@ void TitleBarView::refreshPreferences() {
       assert(printFloatMode == Preferences::PrintFloatMode::Scientific
           || printFloatMode == Preferences::PrintFloatMode::Engineering);
       I18n::Message printMessage = printFloatMode == Preferences::PrintFloatMode::Scientific ? I18n::Message::Sci : I18n::Message::Eng;
-      numberOfChar += strlcpy(buffer, I18n::translate(printMessage), bufferSize);
+      numberOfChar += strlcpy(buffer+numberOfChar, I18n::translate(printMessage), bufferSize - numberOfChar);
       assert(numberOfChar < bufferSize-1);
       assert(UTF8Decoder::CharSizeOfCodePoint('/') == 1);
       buffer[numberOfChar++] = '/';
@@ -108,6 +116,7 @@ void TitleBarView::refreshPreferences() {
         (angleUnit == Preferences::AngleUnit::Radian ? I18n::Message::Rad : I18n::Message::Gon);
     numberOfChar += strlcpy(buffer+numberOfChar, I18n::translate(angleMessage), bufferSize - numberOfChar);
   }
+  
   m_preferenceView.setText(buffer);
   // Layout the exam mode icon if needed
   layoutSubviews();