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:
@@ -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_
|
||||
|
||||
@@ -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/>© 2011-%1<br/>").arg(QString(__DATE__).right(4)));
|
||||
aboutStr.append(tr("Copyright") + QString(" © 2021 EdgeTX<br/>"));
|
||||
// aboutStr.append(tr("Copyright") + QString(" © 2021-%1 EdgeTX<br/>").arg(QString(__DATE__).right(4)));
|
||||
|
||||
QMessageBox msgBox(this);
|
||||
msgBox.setWindowIcon(CompanionIcon("information.png"));
|
||||
msgBox.setWindowTitle(tr("About Companion"));
|
||||
|
||||
@@ -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/"
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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 -> 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", \
|
||||
|
||||
Reference in New Issue
Block a user