Commit bdeb9735 authored by Michael Carpenter's avatar Michael Carpenter

Change of name for diydrones fork of QGroundControl to APM Planner 2.0, per...

Change of name for diydrones fork of QGroundControl to APM Planner 2.0, per Chris Anderson and Craig Elder
parent f418c2e5
......@@ -30,7 +30,7 @@ QT += network \
sql
TEMPLATE = app
TARGET = qgroundcontrol
TARGET = apmplanner2
BASEDIR = $${IN_PWD}
linux-g++|linux-g++-64{
debug {
......
......@@ -102,6 +102,8 @@
<file>files/images/patterns/lenna.jpg</file>
<file>files/images/rc_stick.svg</file>
<file>files/images/actions/qgroundcontrol-connect.svg</file>
<file>files/images/apm_planner_logo.png</file>
<file>files/images/apm_planner_logo_splash.png</file>
</qresource>
<qresource prefix="/general">
<file alias="vera.ttf">files/styles/Vera.ttf</file>
......
......@@ -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())
......
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment