Merge pull request #165 from VArcht/next

GCS: Branding update logos

ground/gcs/src/app/app_resource.qrc

@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/images">
         <file>resources/tau_trans.png</file>
+        <file>resources/gcs_splash.png</file>
     </qresource>
 </RCC>

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();
 

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);

ground/gcs/src/plugins/coreplugin/core.qrc

@@ -58,9 +58,9 @@
         <file>images/helpicon.svg</file>
         <file>images/cpu.png</file>
         <file>images/tx-rx.svg</file>
-        <file>images/taulabs_logo_256.png</file>
-        <file>images/taulabs_logo_32.png</file>
-        <file>images/taulabs_logo_64.png</file>
-        <file>images/taulabs_logo_128.png</file>
+        <file>images/dronin_logo_256.png</file>
+        <file>images/dronin_logo_32.png</file>
+        <file>images/dronin_logo_64.png</file>
+        <file>images/dronin_logo_128.png</file>
     </qresource>
 </RCC>

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";

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

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);

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));

ground/gcs/src/plugins/pathplanner/pathplanner.ui

@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../coreplugin/core.qrc">
-    <normaloff>:/core/images/taulabs_logo_64.png</normaloff>:/core/images/taulabs_logo_64.png</iconset>
+    <normaloff>:/core/images/dronin_logo_64.png</normaloff>:/core/images/dronin_logo_64.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

ground/gcs/src/plugins/pathplanner/waypoint_dialog.ui

@@ -27,7 +27,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../coreplugin/core.qrc">
-    <normaloff>:/core/images/taulabs_logo_128.png</normaloff>:/core/images/taulabs_logo_128.png</iconset>
+    <normaloff>:/core/images/dronin_logo_128.png</normaloff>:/core/images/dronin_logo_128.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

ground/gcs/src/plugins/picoc/picoc.ui

@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../coreplugin/core.qrc">
-    <normaloff>:/core/images/taulabs_logo_64.png</normaloff>:/core/images/taulabs_logo_64.png</iconset>
+    <normaloff>:/core/images/dronin_logo_64.png</normaloff>:/core/images/dronin_logo_64.png</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

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