piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1
View File
@@ -3,6 +3,7 @@ project(EdgeTX)
set(VERSION_MAJOR "2")
set(VERSION_MINOR "5")
set(VERSION_REVISION "0")
set(CODENAME "Dauntless")
set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
companion/src/constants.h
+1 -1
View File
@@ -79,6 +79,6 @@
#define CPN_STR_SW_INDICATOR_NEUT QCoreApplication::translate("RawSwitch", "-") // Switch neutral (middle) position indicator.
#define CPN_STR_SW_INDICATOR_REV QCoreApplication::translate("RawSwitch", "!") // Switch reversed logic (NOT) indicator.
#define OPENTX_HOME_PAGE_URL "http://www.edge-tx.org"
#define OPENTX_HOME_PAGE_URL "https://edgetx.org"
#endif // _CONSTANTS_H_
companion/src/mainwindow.cpp
+9 -7
View File
@@ -65,8 +65,8 @@
#define INTERACTIVE_DOWNLOAD 4
#define AUTOMATIC_DOWNLOAD 8
#define OPENTX_DOWNLOADS_PAGE_URL QStringLiteral("http://www.edge-tx.org/downloads")
#define DONATE_STR QStringLiteral("https://www.edge-tx.org")
#define OPENTX_DOWNLOADS_PAGE_URL QStringLiteral("https://edgetx.org/downloads")
#define DONATE_STR QStringLiteral("https://edgetx.org")
#ifdef Q_OS_MACOS
#define COMPANION_STAMP QStringLiteral("companion-macosx.stamp")
@@ -710,7 +710,7 @@ void MainWindow::newFile()
void MainWindow::openDocURL()
{
QString link = "http://www.edge-tx.org/";
QString link = "https://edgetx.org/";
QDesktopServices::openUrl(QUrl(link));
}
@@ -879,7 +879,7 @@ void MainWindow::sdsync()
void MainWindow::changelog()
{
QString link = "http://www.edge-tx.org";
QString link = "https://edgetx.org";
QDesktopServices::openUrl(QUrl(link));
}
@@ -1010,15 +1010,17 @@ void MainWindow::logFile()
void MainWindow::about()
{
QString aboutStr = "<center><img src=\":/images/companion-title.png\"></center><br/>";
aboutStr.append(tr("EdgeTX Home Page: <a href='%1'>%1</a>").arg("http://www.edge-tx.org"));
aboutStr.append(tr("EdgeTX Home Page: <a href='%1'>%1</a>").arg("https://edgetx.org"));
aboutStr.append("<br/><br/>");
aboutStr.append(tr("The EdgeTX Companion project was originally forked from <a href='%1'>OpenTX</a>").arg("https://github.com/opentx/opentx"));
aboutStr.append("<br/><br/>");
aboutStr.append(tr("If you've found this program useful, please support by <a href='%1'>donating</a>").arg(DONATE_STR));
aboutStr.append("<br/><br/>");
aboutStr.append(QString("Version %1, %2").arg(VERSION).arg(__DATE__));
aboutStr.append(QString("Version %1 \"%2\", %3").arg(VERSION).arg(CODENAME).arg(__DATE__));
aboutStr.append("<br/><br/>");
aboutStr.append(tr("Copyright EdgeTX Team") + QString("<br/>&copy; 2011-%1<br/>").arg(QString(__DATE__).right(4)));
aboutStr.append(tr("Copyright") + QString(" &copy; 2021 EdgeTX<br/>"));
// aboutStr.append(tr("Copyright") + QString(" &copy; 2021-%1 EdgeTX<br/>").arg(QString(__DATE__).right(4)));
QMessageBox msgBox(this);
msgBox.setWindowIcon(CompanionIcon("information.png"));
msgBox.setWindowTitle(tr("About Companion"));
companion/src/storage/appdata.h
+2 -2
View File
@@ -46,7 +46,7 @@
#define CPN_SETTINGS_VERSION ((VERSION_NUMBER << 8) | CPN_SETTINGS_REVISION)
#define COMPANY QStringLiteral("EdgeTX")
#define COMPANY_DOMAIN QStringLiteral("edge-tx.org")
#define COMPANY_DOMAIN QStringLiteral("edgetx.org")
#define PRODUCT QStringLiteral("Companion " QT_STRINGIFY(VERSION_MAJOR) "." QT_STRINGIFY(VERSION_MINOR))
#define APP_COMPANION QStringLiteral("EdgeTX Companion")
#define APP_SIMULATOR QStringLiteral("EdgeTX Simulator")
@@ -58,7 +58,7 @@
#define CPN_SETTINGS_INI_FILE QString(PRODUCT % " " % QCoreApplication::translate("Companion", "settings") % " %1.ini")
#define CPN_SETTINGS_INI_PATH QString(CPN_SETTINGS_BACKUP_DIR % "/" % CPN_SETTINGS_INI_FILE)
#define CPN_URL_DOWNLOAD "https://downloads.edge-tx.org/"
#define CPN_URL_DOWNLOAD "https://downloads.edgetx.org/"
#define CPN_URL_DOWNLOAD_CUR_VERS CPN_URL_DOWNLOAD QT_STRINGIFY(VERSION_MAJOR) "." QT_STRINGIFY(VERSION_MINOR) "/"
#define CPN_URL_DOWNLOAD_CUR_REL CPN_URL_DOWNLOAD_CUR_VERS "release/"
#define CPN_URL_DOWNLOAD_CUR_RC CPN_URL_DOWNLOAD_CUR_VERS "rc/"
companion/src/version.h.in
+1
View File
@@ -3,6 +3,7 @@
#define VERSION_MINOR @VERSION_MINOR@
#define VERSION_REVISION @VERSION_REVISION@
#define VERSION_SUFFIX "@VERSION_SUFFIX@"
#define CODENAME "@CODENAME@"
#define VERSION_NUMBER ((VERSION_MAJOR << 16) | (VERSION_MINOR << 8) | VERSION_REVISION)
companion/src/warnings.h
+2 -2
View File
@@ -32,14 +32,14 @@
"<p>As the first step, please configure the initial Radio Profile by selecting your Radio Type, Menu Language, and Build Options.</p>" \
"<p>You may also want to take this time to review the other available options in the displayed Settings dialog.</p>" \
"<p>After saving your settings, we recommend you download the latest firmware for your radio by using the <i>File -&gt; Download</i> menu option.</p>" \
"<p>Please visit <a href='http://www.edge-tx.org'>edge-tx.org</a> for latest news, updates and documentation. Thank you for choosing EdgeTX!</p>" \
"<p>Please visit <a href='https://edgetx.org'>edgetx.org</a> for latest news, updates and documentation. Thank you for choosing EdgeTX!</p>" \
"- The EdgeTX Team.")
#define CPN_STR_MSG_UPGRADED QCoreApplication::translate("Companion", \
"<p><b>Thank you for upgrading to EdgeTX %1.</b></p>" \
"<p>This is a major upgrade that adds and modifies a lot of things, so please make sure that you read release notes carefully" \
" to learn about the changes, and thoroughly check each of your models for proper function.</p>" \
"<p>Please visit <a href='http://www.edge-tx.org'>edge-tx.org</a> for release notes and other documentation.</p>" \
"<p>Please visit <a href='https://edgetx.org'>edgetx.org</a> for release notes and other documentation.</p>" \
"- The EdgeTX Team.")
#define CPN_STR_MSG_NO_RADIO_TYPE QCoreApplication::translate("Companion", \
radio/src/gui/128x64/view_about.cpp
+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)
{
radio/src/gui/212x64/view_about.cpp
+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)
{
radio/src/gui/colorlcd/view_about.cpp
+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()},
radio/src/stamp.h.in
+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@