Commit da79b6ce authored by Michael Carpenter's avatar Michael Carpenter

Change for new APM2.0 logo

parent bdeb9735
...@@ -104,6 +104,8 @@ ...@@ -104,6 +104,8 @@
<file>files/images/actions/qgroundcontrol-connect.svg</file> <file>files/images/actions/qgroundcontrol-connect.svg</file>
<file>files/images/apm_planner_logo.png</file> <file>files/images/apm_planner_logo.png</file>
<file>files/images/apm_planner_logo_splash.png</file> <file>files/images/apm_planner_logo_splash.png</file>
<file>files/images/apm_planner_2_0-07.png</file>
<file>files/images/apm_planner_2_0-08.png</file>
</qresource> </qresource>
<qresource prefix="/general"> <qresource prefix="/general">
<file alias="vera.ttf">files/styles/Vera.ttf</file> <file alias="vera.ttf">files/styles/Vera.ttf</file>
......
...@@ -71,8 +71,8 @@ QGCCore::QGCCore(int &argc, char* argv[]) : QApplication(argc, argv) ...@@ -71,8 +71,8 @@ QGCCore::QGCCore(int &argc, char* argv[]) : QApplication(argc, argv)
// Set application name // Set application name
this->setApplicationName(QGC_APPLICATION_NAME); this->setApplicationName(QGC_APPLICATION_NAME);
this->setApplicationVersion(QGC_APPLICATION_VERSION); this->setApplicationVersion(QGC_APPLICATION_VERSION);
this->setOrganizationName(QLatin1String("3DRobotics")); this->setOrganizationName(QLatin1String("diydrones"));
this->setOrganizationDomain("org.3drobotics"); this->setOrganizationDomain("org.diydrones");
// Set settings format // Set settings format
QSettings::setDefaultFormat(QSettings::IniFormat); QSettings::setDefaultFormat(QSettings::IniFormat);
...@@ -108,7 +108,7 @@ QGCCore::QGCCore(int &argc, char* argv[]) : QApplication(argc, argv) ...@@ -108,7 +108,7 @@ QGCCore::QGCCore(int &argc, char* argv[]) : QApplication(argc, argv)
settings.sync(); settings.sync();
// Show splash screen // Show splash screen
QPixmap splashImage(":/files/images/apm_planner_logo_splash.png"); QPixmap splashImage(":/files/images/apm_planner_2_0-07.png");
QSplashScreen* splashScreen = new QSplashScreen(splashImage); QSplashScreen* splashScreen = new QSplashScreen(splashImage);
// Delete splash screen after mainWindow was displayed // Delete splash screen after mainWindow was displayed
splashScreen->setAttribute(Qt::WA_DeleteOnClose); splashScreen->setAttribute(Qt::WA_DeleteOnClose);
......
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