Add codename define, update radio version screens and tweak companion (#747)

* Add codename deffine and update all radio version screens

* Move string, make const and formatting

* Missed parentheses around version number

* Add codename to Companion

* Replace edge-tx.org with edgetx.org

* Change EdgeTX website http links to https
Also consistent URL

* Update copyright string
Leave second version for future years
This commit is contained in:
Peter Feerick
2021-09-18 20:35:31 +10:00
committed by GitHub
parent fd1f6d2f3d
commit 47dac14b2f
10 changed files with 29 additions and 20 deletions
+3 -2
View File
@@ -19,12 +19,13 @@
*/
#include "opentx.h"
#include "stamp.h"
#define ABOUT_INDENT 4
const char ABOUT_VERSION_1[] = "EdgeTX Endeavour (2.4.0)";
const char ABOUT_VERSION_1[] = "EdgeTX " CODENAME "(" VERSION ")";
const char ABOUT_VERSION_2[] = "Copyright (C) 2021 EdgeTX";
const char ABOUT_VERSION_3[] = "https://edge-tx.org";
const char ABOUT_VERSION_3[] = "https://edgetx.org";
void menuAboutView(event_t event)
{
+3 -2
View File
@@ -19,12 +19,13 @@
*/
#include "opentx.h"
#include "stamp.h"
#define ABOUT_INDENT 6
const char ABOUT_VERSION_1[] = "EdgeTX Endeavour (2.4.0)";
const char ABOUT_VERSION_1[] = "EdgeTX " CODENAME "(" VERSION ")";
const char ABOUT_VERSION_2[] = "Copyright (C) 2021 EdgeTX";
const char ABOUT_VERSION_3[] = "https://edge-tx.org";
const char ABOUT_VERSION_3[] = "https://edgetx.org";
void menuAboutView(event_t event)
{
+6 -4
View File
@@ -21,12 +21,15 @@
#include "view_about.h"
#include "opentx.h"
#include "stamp.h"
const uint8_t mask_qrcode[] = {
#include "mask_qrcode.lbm"
};
constexpr coord_t ABOUT_WIDTH = 220;
const std::string about_str = "EdgeTX" " " CODENAME " (" VERSION ")";
const std::string copyright_str = "Copyright (C) 2021 EdgeTX";
AboutUs::AboutUs() :
MessageDialog(MainWindow::instance(), STR_ABOUT_US, "")
@@ -37,11 +40,10 @@ AboutUs::AboutUs() :
messageWidget->setTop(content->top() + 40);
messageWidget->setHeight(2*PAGE_LINE_HEIGHT);
messageWidget->setText("EdgeTX Dauntless (2.5.0)\n"
"Copyright (C) 2021 EdgeTX");
messageWidget->setText(about_str + "\n" + copyright_str);
qrcode = BitmapBuffer::load8bitMaskOnBackground(mask_qrcode, COLOR_THEME_SECONDARY1,
COLOR_THEME_SECONDARY3);
qrcode = BitmapBuffer::load8bitMaskOnBackground(
mask_qrcode, COLOR_THEME_SECONDARY1, COLOR_THEME_SECONDARY3);
new StaticBitmap(content,
rect_t{ content->width() / 2 - qrcode->width() / 2, 80,
qrcode->width(), qrcode->height()},
+1
View File
@@ -1,6 +1,7 @@
#define DATE "@DATE@"
#define TIME "@TIME@"
#define VERSION "@VERSION@"
#define CODENAME "@CODENAME@"
#define VERSION_MAJOR @VERSION_MAJOR@
#define VERSION_MINOR @VERSION_MINOR@