From 14c900be4d068607e9dcc9a2837415251d1a7ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Tue, 10 Mar 2020 18:21:59 +0100 Subject: [PATCH] [Change] CustomSoftwareVersion -> OmegaVersion --- apps/omega/omega_controller.cpp | 2 +- apps/settings/base.de.i18n | 2 +- apps/settings/base.en.i18n | 2 +- apps/settings/base.es.i18n | 2 +- apps/settings/base.fr.i18n | 2 +- apps/settings/base.hu.i18n | 2 +- apps/settings/base.pt.i18n | 2 +- apps/settings/main_controller.cpp | 4 ++-- apps/settings/sub_menu/about_controller.cpp | 8 ++++---- build/config.mak | 2 +- ion/Makefile | 2 +- ion/include/ion.h | 2 +- ion/src/shared/platform_info.cpp | 16 ++++++++-------- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apps/omega/omega_controller.cpp b/apps/omega/omega_controller.cpp index 0f82dbbb4..39c1629ac 100644 --- a/apps/omega/omega_controller.cpp +++ b/apps/omega/omega_controller.cpp @@ -15,7 +15,7 @@ OmegaController::OmegaController(Responder * parentResponder) : m_contributorsCell.setMessageFont(KDFont::LargeFont); m_versionCell.setMessageFont(KDFont::LargeFont); m_versionCell.setAccessoryFont(KDFont::SmallFont); - m_versionCell.setAccessoryText(Ion::customSoftwareVersion()); + m_versionCell.setAccessoryText(Ion::omegaVersion()); } View * OmegaController::view() { diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n index bc10bd120..7a902b861 100644 --- a/apps/settings/base.de.i18n +++ b/apps/settings/base.de.i18n @@ -33,7 +33,7 @@ Cartesian = "Algebraische " Polar = "Polar " Brightness = "Helligkeit" SoftwareVersion = "Epsilon version" -CustomSoftwareVersion = "Omega version" +OmegaVersion = "Omega version" Username = "Name" MicroPythonVersion = "µPythonversion" ResultDisplay = "Ergebniswiedergabe" diff --git a/apps/settings/base.en.i18n b/apps/settings/base.en.i18n index e09b048fa..c2debb3a1 100644 --- a/apps/settings/base.en.i18n +++ b/apps/settings/base.en.i18n @@ -33,7 +33,7 @@ Cartesian = "Cartesian " Polar = "Polar " Brightness = "Brightness" SoftwareVersion = "Epsilon version" -CustomSoftwareVersion = "Omega version" +OmegaVersion = "Omega version" Username = "Name" MicroPythonVersion = "µPython version" ResultDisplay = "Result display" diff --git a/apps/settings/base.es.i18n b/apps/settings/base.es.i18n index c8d4a88a1..ea163ee2d 100644 --- a/apps/settings/base.es.i18n +++ b/apps/settings/base.es.i18n @@ -33,7 +33,7 @@ Cartesian = "Binómica " Polar = "Polar " Brightness = "Brillo" SoftwareVersion = "Versión de Epsilon" -CustomSoftwareVersion = "Versión de Omega" +OmegaVersion = "Versión de Omega" Username = "Apellido" MicroPythonVersion = "Version de µPython" ResultDisplay = "Visualización resultados" diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n index a23f8a0b9..bc35a6eaf 100644 --- a/apps/settings/base.fr.i18n +++ b/apps/settings/base.fr.i18n @@ -33,7 +33,7 @@ Cartesian = "Algébrique " Polar = "Exponentielle " Brightness = "Luminosité" SoftwareVersion = "Version d'Epsilon" -CustomSoftwareVersion = "Version d'Omega" +OmegaVersion = "Version d'Omega" Username = "Nom" MicroPythonVersion = "Version de µPython" ResultDisplay = "Mode d'affichage" diff --git a/apps/settings/base.hu.i18n b/apps/settings/base.hu.i18n index b3828759e..cd4511288 100644 --- a/apps/settings/base.hu.i18n +++ b/apps/settings/base.hu.i18n @@ -33,7 +33,7 @@ Cartesian = "Kartéziánus " Polar = "Poláris " Brightness = "Fényerö" SoftwareVersion = "Epsilon verzió" -CustomSoftwareVersion = "Omega verzió" +OmegaVersion = "Omega verzió" Username = "Felhasználónév" MicroPythonVersion = "µPython verzió" ResultDisplay = "Eredménykijelzö" diff --git a/apps/settings/base.pt.i18n b/apps/settings/base.pt.i18n index c3fb57e31..561a88503 100644 --- a/apps/settings/base.pt.i18n +++ b/apps/settings/base.pt.i18n @@ -33,7 +33,7 @@ Cartesian = "Cartesiana " Polar = "Polar " Brightness = "Brilho" SoftwareVersion = "Versão do Epsilon" -CustomSoftwareVersion = "Versão do Omega" +OmegaVersion = "Versão do Omega" Username = "Nome" MicroPythonVersion = "Versao do µPython" ResultDisplay = "Exibição resultado" diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 1a5f4b630..e4eea9f28 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -20,9 +20,9 @@ constexpr SettingsMessageTree s_modelFontChildren[2] = {SettingsMessageTree(I18n constexpr SettingsMessageTree s_accessibilityChildren[6] = {SettingsMessageTree(I18n::Message::AccessibilityInvertColors), SettingsMessageTree(I18n::Message::AccessibilityMagnify),SettingsMessageTree(I18n::Message::AccessibilityGamma),SettingsMessageTree(I18n::Message::AccessibilityGammaRed),SettingsMessageTree(I18n::Message::AccessibilityGammaGreen),SettingsMessageTree(I18n::Message::AccessibilityGammaBlue)}; constexpr SettingsMessageTree s_contributorsChildren[17] = {SettingsMessageTree(I18n::Message::Developers), SettingsMessageTree(I18n::Message::QuentinGuidee), SettingsMessageTree(I18n::Message::DannySimmons), SettingsMessageTree(I18n::Message::JoachimLeFournis), SettingsMessageTree(I18n::Message::JeanBaptisteBoric), SettingsMessageTree(I18n::Message::MaximeFriess), SettingsMessageTree(I18n::Message::David), SettingsMessageTree(I18n::Message::DamienNicolet), SettingsMessageTree(I18n::Message::EvannDreumont), SettingsMessageTree(I18n::Message::SzaboLevente), SettingsMessageTree(I18n::Message::VenceslasDuet), SettingsMessageTree(I18n::Message::CharlotteThomas), SettingsMessageTree(I18n::Message::BetaTesters), SettingsMessageTree(I18n::Message::CyprienMejat), SettingsMessageTree(I18n::Message::TimeoArnouts), SettingsMessageTree(I18n::Message::LouisC), SettingsMessageTree(I18n::Message::LelahelHideux)}; #ifdef USERNAME -constexpr SettingsMessageTree s_modelAboutChildren[8] = {SettingsMessageTree(I18n::Message::Username), SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::MicroPythonVersion), SettingsMessageTree(I18n::Message::MemUse), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren)}; +constexpr SettingsMessageTree s_modelAboutChildren[8] = {SettingsMessageTree(I18n::Message::Username), SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::OmegaVersion), SettingsMessageTree(I18n::Message::MicroPythonVersion), SettingsMessageTree(I18n::Message::MemUse), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren)}; #else -constexpr SettingsMessageTree s_modelAboutChildren[7] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::CustomSoftwareVersion), SettingsMessageTree(I18n::Message::MicroPythonVersion), SettingsMessageTree(I18n::Message::MemUse), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren)}; +constexpr SettingsMessageTree s_modelAboutChildren[7] = {SettingsMessageTree(I18n::Message::SoftwareVersion), SettingsMessageTree(I18n::Message::OmegaVersion), SettingsMessageTree(I18n::Message::MicroPythonVersion), SettingsMessageTree(I18n::Message::MemUse), SettingsMessageTree(I18n::Message::SerialNumber), SettingsMessageTree(I18n::Message::FccId), SettingsMessageTree(I18n::Message::Contributors, s_contributorsChildren)}; #endif MainController::MainController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate) : diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp index e5c816959..f816bab68 100644 --- a/apps/settings/sub_menu/about_controller.cpp +++ b/apps/settings/sub_menu/about_controller.cpp @@ -50,13 +50,13 @@ bool AboutController::handleEvent(Ion::Events::Event event) { myCell->setAccessoryText(Ion::patchLevel()); return true; } - if (childLabel == I18n::Message::CustomSoftwareVersion) { + if (childLabel == I18n::Message::OmegaVersion) { MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell(); - if (strcmp(myCell->accessoryText(), Ion::customSoftwareVersion()) == 0) { + if (strcmp(myCell->accessoryText(), Ion::omegaVersion()) == 0) { myCell->setAccessoryText("Dev"); //Change for public/dev return true; } - myCell->setAccessoryText(Ion::customSoftwareVersion()); + myCell->setAccessoryText(Ion::omegaVersion()); return true; } if (childLabel == I18n::Message::MemUse) { @@ -146,7 +146,7 @@ void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) { Ion::username(), #endif Ion::softwareVersion(), - Ion::customSoftwareVersion(), + Ion::omegaVersion(), mpVersion, "", Ion::serialNumber(), diff --git a/build/config.mak b/build/config.mak index 184b09252..9f58d58a8 100644 --- a/build/config.mak +++ b/build/config.mak @@ -8,7 +8,7 @@ include build/defaults.mak include build/platform.$(PLATFORM).mak EPSILON_VERSION ?= 13.0.0 -EPSILON_CUSTOM_VERSION ?= 1.20.0 +OMEGA_VERSION ?= 1.20.0 # USERNAME ?= N/A EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings external omega EPSILON_I18N ?= en fr es de pt hu diff --git a/ion/Makefile b/ion/Makefile index e3a381c3d..b81931cc9 100644 --- a/ion/Makefile +++ b/ion/Makefile @@ -22,7 +22,7 @@ ion_console_display_src += ion/src/shared/console_display.cpp # char test[4]= "ab"; is valid and should initialize test to 'a','b',0,0). # Older versions of GCC are not conformant so we resort to an initializer list. initializer_list = $(shell echo $(1) | sed "s/\(.\)/'\1',/g")0 -$(call object_for,ion/src/shared/platform_info.cpp): SFLAGS += -DPATCH_LEVEL="$(call initializer_list,$(PATCH_LEVEL))" -DEPSILON_VERSION="$(call initializer_list,$(EPSILON_VERSION))" -DEPSILON_CUSTOM_VERSION="$(call initializer_list,$(EPSILON_CUSTOM_VERSION))" -DUSERNAME="$(call initializer_list,$(USERNAME))" +$(call object_for,ion/src/shared/platform_info.cpp): SFLAGS += -DPATCH_LEVEL="$(call initializer_list,$(PATCH_LEVEL))" -DEPSILON_VERSION="$(call initializer_list,$(EPSILON_VERSION))" -DOMEGA_VERSION="$(call initializer_list,$(OMEGA_VERSION))" -DUSERNAME="$(call initializer_list,$(USERNAME))" ion_src += $(addprefix ion/src/shared/, \ console_line.cpp \ diff --git a/ion/include/ion.h b/ion/include/ion.h index 8b762cd7f..dba438223 100644 --- a/ion/include/ion.h +++ b/ion/include/ion.h @@ -33,7 +33,7 @@ const char * serialNumber(); const char * username(); #endif const char * softwareVersion(); -const char * customSoftwareVersion(); +const char * omegaVersion(); const char * patchLevel(); const char * fccId(); diff --git a/ion/src/shared/platform_info.cpp b/ion/src/shared/platform_info.cpp index 592be3dc2..053f60d73 100644 --- a/ion/src/shared/platform_info.cpp +++ b/ion/src/shared/platform_info.cpp @@ -9,8 +9,8 @@ #error This file expects EPSILON_VERSION to be defined #endif -#ifndef EPSILON_CUSTOM_VERSION -#error This file expects EPSILON_CUSTOM_VERSION to be defined +#ifndef OMEGA_VERSION +#error This file expects OMEGA_VERSION to be defined #endif #ifndef HEADER_SECTION @@ -32,7 +32,7 @@ public: m_storageSize(Ion::Storage::k_storageSize), m_footer(Magic), m_ohm_header(OmegaMagic), - m_customVersion{EPSILON_CUSTOM_VERSION}, + m_omegaVersion{OMEGA_VERSION}, #ifdef USERNAME m_username{USERNAME}, #else @@ -48,14 +48,14 @@ public: assert(m_ohm_footer == OmegaMagic); return m_version; } - const char * customVersion() const { + const char * omegaVersion() const { assert(m_storageAddress != nullptr); assert(m_storageSize != 0); assert(m_header == Magic); assert(m_footer == Magic); assert(m_ohm_header == OmegaMagic); assert(m_ohm_footer == OmegaMagic); - return m_customVersion; + return m_omegaVersion; } #ifdef USERNAME const char * username() const { @@ -87,7 +87,7 @@ private: size_t m_storageSize; uint32_t m_footer; uint32_t m_ohm_header; - const char m_customVersion[16]; + const char m_omegaVersion[16]; const char m_username[16]; uint32_t m_ohm_footer; }; @@ -98,8 +98,8 @@ const char * Ion::softwareVersion() { return platform_infos.version(); } -const char * Ion::customSoftwareVersion() { - return platform_infos.customVersion(); +const char * Ion::omegaVersion() { + return platform_infos.omegaVersion(); } #ifdef USERNAME