diff --git a/ground/gcs/src/app/app_resource.qrc b/ground/gcs/src/app/app_resource.qrc index 7c6cd6a616..13adfe1e6c 100644 --- a/ground/gcs/src/app/app_resource.qrc +++ b/ground/gcs/src/app/app_resource.qrc @@ -1,5 +1,6 @@ resources/tau_trans.png + resources/gcs_splash.png diff --git a/ground/gcs/src/app/dronin.icns b/ground/gcs/src/app/dronin.icns index ce6c1e7017..ed4f4d1b2d 100644 Binary files a/ground/gcs/src/app/dronin.icns and b/ground/gcs/src/app/dronin.icns differ diff --git a/ground/gcs/src/app/dronin.ico b/ground/gcs/src/app/dronin.ico index e5b4a99019..e4b481d4b0 100644 Binary files a/ground/gcs/src/app/dronin.ico and b/ground/gcs/src/app/dronin.ico differ diff --git a/ground/gcs/src/app/main.cpp b/ground/gcs/src/app/main.cpp index 3f0033ebee..0554ee0ece 100644 --- a/ground/gcs/src/app/main.cpp +++ b/ground/gcs/src/app/main.cpp @@ -309,7 +309,7 @@ int main(int argc, char **argv) QTranslator translator; QTranslator qtTranslator; - QPixmap pixmap(":/images/resources/tau_trans.png"); + QPixmap pixmap(":/images/resources/gcs_splash.png"); CustomSplash splash(pixmap); splash.show(); diff --git a/ground/gcs/src/app/resources/gcs_splash.png b/ground/gcs/src/app/resources/gcs_splash.png new file mode 100644 index 0000000000..909e33d0c4 Binary files /dev/null and b/ground/gcs/src/app/resources/gcs_splash.png differ diff --git a/ground/gcs/src/plugins/coreplugin/authorsdialog.cpp b/ground/gcs/src/plugins/coreplugin/authorsdialog.cpp index 4858a3edf3..6be7664858 100644 --- a/ground/gcs/src/plugins/coreplugin/authorsdialog.cpp +++ b/ground/gcs/src/plugins/coreplugin/authorsdialog.cpp @@ -52,7 +52,7 @@ AuthorsDialog::AuthorsDialog(QWidget *parent) { // We need to set the window icon explicitly here since for some reason the // application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME) - setWindowIcon(QIcon(":/core/images/taulabs_logo_32.png")); + setWindowIcon(QIcon(":/core/images/dronin_logo_32.png")); setWindowTitle(tr("About Tau Labs Authors")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -86,7 +86,7 @@ AuthorsDialog::AuthorsDialog(QWidget *parent) connect(buttonBox , SIGNAL(rejected()), this, SLOT(reject())); QLabel *logoLabel = new QLabel; - logoLabel->setPixmap(QPixmap(QLatin1String(":/core/images/taulabs_logo_128.png"))); + logoLabel->setPixmap(QPixmap(QLatin1String(":/core/images/dronin_logo_128.png"))); layout->addWidget(logoLabel , 0, 0, 1, 1); layout->addWidget(copyRightLabel, 0, 1, 2, 4); layout->addWidget(creditsArea, 3, 0, 2, 5); diff --git a/ground/gcs/src/plugins/coreplugin/core.qrc b/ground/gcs/src/plugins/coreplugin/core.qrc index 299170f383..553552f68e 100644 --- a/ground/gcs/src/plugins/coreplugin/core.qrc +++ b/ground/gcs/src/plugins/coreplugin/core.qrc @@ -58,9 +58,9 @@ images/helpicon.svg images/cpu.png images/tx-rx.svg - images/taulabs_logo_256.png - images/taulabs_logo_32.png - images/taulabs_logo_64.png - images/taulabs_logo_128.png + images/dronin_logo_256.png + images/dronin_logo_32.png + images/dronin_logo_64.png + images/dronin_logo_128.png diff --git a/ground/gcs/src/plugins/coreplugin/coreconstants.h b/ground/gcs/src/plugins/coreplugin/coreconstants.h index bb584f8e30..8550ce3221 100644 --- a/ground/gcs/src/plugins/coreplugin/coreconstants.h +++ b/ground/gcs/src/plugins/coreplugin/coreconstants.h @@ -218,7 +218,7 @@ const char * const ICON_PLUGIN = ":/core/images/pluginicon.png"; const char * const ICON_EXIT = ":/core/images/exiticon.png"; const char * const ICON_OPTIONS = ":/core/images/optionsicon.png"; const char * const ICON_HELP = ":/core/images/helpicon.png"; -const char * const ICON_TAULABS = ":/core/images/taulabs_logo_128.png"; +const char * const ICON_TAULABS = ":/core/images/dronin_logo_128.png"; // wizard kind const char * const WIZARD_TYPE_FILE = "GCS::WizardType::File"; diff --git a/ground/gcs/src/plugins/coreplugin/coreplugin.pro b/ground/gcs/src/plugins/coreplugin/coreplugin.pro index 175d77862a..b8318662e3 100644 --- a/ground/gcs/src/plugins/coreplugin/coreplugin.pro +++ b/ground/gcs/src/plugins/coreplugin/coreplugin.pro @@ -142,7 +142,7 @@ FORMS += dialogs/settingsdialog.ui \ dialogs/importsettings.ui RESOURCES += core.qrc unix:!macx { - images.files = images/taulabs_logo_*.png + images.files = images/dronin_logo_*.png images.files = images/qtcreator_logo_*.png images.path = /share/pixmaps INSTALLS += images diff --git a/ground/gcs/src/plugins/coreplugin/images/dronin_logo_128.png b/ground/gcs/src/plugins/coreplugin/images/dronin_logo_128.png new file mode 100644 index 0000000000..4d131dc60c Binary files /dev/null and b/ground/gcs/src/plugins/coreplugin/images/dronin_logo_128.png differ diff --git a/ground/gcs/src/plugins/coreplugin/images/dronin_logo_256.png b/ground/gcs/src/plugins/coreplugin/images/dronin_logo_256.png new file mode 100644 index 0000000000..909e33d0c4 Binary files /dev/null and b/ground/gcs/src/plugins/coreplugin/images/dronin_logo_256.png differ diff --git a/ground/gcs/src/plugins/coreplugin/images/dronin_logo_32.png b/ground/gcs/src/plugins/coreplugin/images/dronin_logo_32.png new file mode 100644 index 0000000000..85afc9b2a5 Binary files /dev/null and b/ground/gcs/src/plugins/coreplugin/images/dronin_logo_32.png differ diff --git a/ground/gcs/src/plugins/coreplugin/images/dronin_logo_64.png b/ground/gcs/src/plugins/coreplugin/images/dronin_logo_64.png new file mode 100644 index 0000000000..4e14bfbe5f Binary files /dev/null and b/ground/gcs/src/plugins/coreplugin/images/dronin_logo_64.png differ diff --git a/ground/gcs/src/plugins/coreplugin/versiondialog.cpp b/ground/gcs/src/plugins/coreplugin/versiondialog.cpp index 8bef4536b1..11a371d03f 100644 --- a/ground/gcs/src/plugins/coreplugin/versiondialog.cpp +++ b/ground/gcs/src/plugins/coreplugin/versiondialog.cpp @@ -53,7 +53,7 @@ VersionDialog::VersionDialog(QWidget *parent) { // We need to set the window icon explicitly here since for some reason the // application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME) - setWindowIcon(QIcon(":/core/images/taulabs_logo_32.png")); + setWindowIcon(QIcon(":/core/images/dronin_logo_32.png")); setWindowTitle(tr("About dRonin GCS")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); @@ -136,7 +136,7 @@ VersionDialog::VersionDialog(QWidget *parent) connect(buttonBox , SIGNAL(rejected()), this, SLOT(reject())); QLabel *logoLabel = new QLabel; - logoLabel->setPixmap(QPixmap(QLatin1String(":/core/images/taulabs_logo_128.png"))); + logoLabel->setPixmap(QPixmap(QLatin1String(":/core/images/dronin_logo_128.png"))); QLabel *copyRightLabel = new QLabel(copyright); copyRightLabel->setWordWrap(true); diff --git a/ground/gcs/src/plugins/coreplugin/workspacesettings.cpp b/ground/gcs/src/plugins/coreplugin/workspacesettings.cpp index 1cb1832cde..b2b2f324ed 100644 --- a/ground/gcs/src/plugins/coreplugin/workspacesettings.cpp +++ b/ground/gcs/src/plugins/coreplugin/workspacesettings.cpp @@ -116,7 +116,7 @@ void WorkspaceSettings::readSettings(QSettings* qs) QString defaultName = "Workspace" + numberString; QString defaultIconName = "Icon" + numberString; QString name = qs->value(defaultName, defaultName).toString(); - QString iconName = qs->value(defaultIconName, ":/core/images/taulabs_logo_64.png").toString(); + QString iconName = qs->value(defaultIconName, ":/core/images/dronin_logo_64.png").toString(); m_names.append(name); m_iconNames.append(iconName); m_modeNames.append(QString("Mode")+ QString::number(i)); diff --git a/ground/gcs/src/plugins/pathplanner/pathplanner.ui b/ground/gcs/src/plugins/pathplanner/pathplanner.ui index 529893e0fa..f30eba8063 100644 --- a/ground/gcs/src/plugins/pathplanner/pathplanner.ui +++ b/ground/gcs/src/plugins/pathplanner/pathplanner.ui @@ -15,7 +15,7 @@ - :/core/images/taulabs_logo_64.png:/core/images/taulabs_logo_64.png + :/core/images/dronin_logo_64.png:/core/images/dronin_logo_64.png diff --git a/ground/gcs/src/plugins/pathplanner/waypoint_dialog.ui b/ground/gcs/src/plugins/pathplanner/waypoint_dialog.ui index 0ab2d995f9..c8d593c4ed 100644 --- a/ground/gcs/src/plugins/pathplanner/waypoint_dialog.ui +++ b/ground/gcs/src/plugins/pathplanner/waypoint_dialog.ui @@ -27,7 +27,7 @@ - :/core/images/taulabs_logo_128.png:/core/images/taulabs_logo_128.png + :/core/images/dronin_logo_128.png:/core/images/dronin_logo_128.png diff --git a/ground/gcs/src/plugins/picoc/picoc.ui b/ground/gcs/src/plugins/picoc/picoc.ui index 032138891c..cbbfe7455e 100644 --- a/ground/gcs/src/plugins/picoc/picoc.ui +++ b/ground/gcs/src/plugins/picoc/picoc.ui @@ -15,7 +15,7 @@ - :/core/images/taulabs_logo_64.png:/core/images/taulabs_logo_64.png + :/core/images/dronin_logo_64.png:/core/images/dronin_logo_64.png diff --git a/ground/gcs/src/plugins/welcome/qml/images/welcome-logo.png b/ground/gcs/src/plugins/welcome/qml/images/welcome-logo.png index d169ebacb4..068708a10c 100644 Binary files a/ground/gcs/src/plugins/welcome/qml/images/welcome-logo.png and b/ground/gcs/src/plugins/welcome/qml/images/welcome-logo.png differ diff --git a/ground/gcs/src/plugins/welcome/qml/main.qml b/ground/gcs/src/plugins/welcome/qml/main.qml index 3fc093a747..e5b667e562 100644 --- a/ground/gcs/src/plugins/welcome/qml/main.qml +++ b/ground/gcs/src/plugins/welcome/qml/main.qml @@ -7,13 +7,25 @@ Rectangle { gradient: Gradient { GradientStop { position: 0 - color: "#333333" + color: "#ffffff" + } + + GradientStop { + position: 0.03 + color: "#ffffff" } GradientStop { position: 1 - color: "#232323" + color: "#b9b9b9" + } + + GradientStop { + position: 0.927 + color: "#d2d2d2" } + + } Column { @@ -33,12 +45,13 @@ Rectangle { spacing: 16 Image { - x: -56 + x: -55 + antialiasing: true sourceSize.height: 235 sourceSize.width: 234 source: "images/welcome-logo.png" anchors.verticalCenter: parent.verticalCenter - anchors.verticalCenterOffset: -2 //it looks better aligned to icons grid + anchors.verticalCenterOffset: -16 //it looks better aligned to icons grid //hide the logo on the very small screen to fit the buttons visible: parent.availableWidth > width + parent.spacing + buttons.width + wizard.width