From bdeb97354254b073640ac698bae287b1c5372504 Mon Sep 17 00:00:00 2001 From: Michael Carpenter Date: Thu, 13 Jun 2013 15:14:31 -0400 Subject: [PATCH] Change of name for diydrones fork of QGroundControl to APM Planner 2.0, per Chris Anderson and Craig Elder --- qgroundcontrol.pro | 2 +- qgroundcontrol.qrc | 2 ++ src/QGCCore.cc | 8 ++++---- src/configuration.h | 10 +++++----- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 9990466eb..bf6c51e0f 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -30,7 +30,7 @@ QT += network \ sql TEMPLATE = app -TARGET = qgroundcontrol +TARGET = apmplanner2 BASEDIR = $${IN_PWD} linux-g++|linux-g++-64{ debug { diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 4b47ee099..c36f4140c 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -102,6 +102,8 @@ files/images/patterns/lenna.jpg files/images/rc_stick.svg files/images/actions/qgroundcontrol-connect.svg + files/images/apm_planner_logo.png + files/images/apm_planner_logo_splash.png files/styles/Vera.ttf diff --git a/src/QGCCore.cc b/src/QGCCore.cc index 3354fe646..43d170b72 100644 --- a/src/QGCCore.cc +++ b/src/QGCCore.cc @@ -71,8 +71,8 @@ QGCCore::QGCCore(int &argc, char* argv[]) : QApplication(argc, argv) // Set application name this->setApplicationName(QGC_APPLICATION_NAME); this->setApplicationVersion(QGC_APPLICATION_VERSION); - this->setOrganizationName(QLatin1String("QGroundControl")); - this->setOrganizationDomain("org.qgroundcontrol"); + this->setOrganizationName(QLatin1String("3DRobotics")); + this->setOrganizationDomain("org.3drobotics"); // Set settings format QSettings::setDefaultFormat(QSettings::IniFormat); @@ -108,7 +108,7 @@ QGCCore::QGCCore(int &argc, char* argv[]) : QApplication(argc, argv) settings.sync(); // Show splash screen - QPixmap splashImage(":/files/images/splash.png"); + QPixmap splashImage(":/files/images/apm_planner_logo_splash.png"); QSplashScreen* splashScreen = new QSplashScreen(splashImage); // Delete splash screen after mainWindow was displayed splashScreen->setAttribute(Qt::WA_DeleteOnClose); @@ -168,7 +168,7 @@ QGCCore::QGCCore(int &argc, char* argv[]) : QApplication(argc, argv) // Remove splash screen splashScreen->finish(mainWindow); - if (upgraded) mainWindow->showInfoMessage(tr("Default Settings Loaded"), tr("QGroundControl has been upgraded from version %1 to version %2. Some of your user preferences have been reset to defaults for safety reasons. Please adjust them where needed.").arg(lastApplicationVersion).arg(QGC_APPLICATION_VERSION)); + if (upgraded) mainWindow->showInfoMessage(tr("Default Settings Loaded"), tr("APM Planner has been upgraded from version %1 to version %2. Some of your user preferences have been reset to defaults for safety reasons. Please adjust them where needed.").arg(lastApplicationVersion).arg(QGC_APPLICATION_VERSION)); // Check if link could be connected if (!udpLink->connect()) diff --git a/src/configuration.h b/src/configuration.h index 88e19d825..f6a9a7bb3 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -10,15 +10,15 @@ #define MAVLINK_HEARTBEAT_DEFAULT_RATE 1 #define WITH_TEXT_TO_SPEECH 1 -#define QGC_APPLICATION_NAME "QGroundControl" -#define QGC_APPLICATION_VERSION "v. 1.0.9 (beta RC1)" +#define QGC_APPLICATION_NAME "APM Planner" +#define QGC_APPLICATION_VERSION "v2.0.0 (beta)" namespace QGC { -const QString APPNAME = "QGROUNDCONTROL"; -const QString COMPANYNAME = "QGROUNDCONTROL"; -const int APPLICATIONVERSION = 109; // 1.0.9 +const QString APPNAME = "APMPLANNER"; +const QString COMPANYNAME = "3DROBOTICS"; +const int APPLICATIONVERSION = 200; // 1.0.9 } #endif // QGC_CONFIGURATION_H -- 2.22.0