Skip to content

Commit

Permalink
GCS: Branding Logo Cleanup
Browse files Browse the repository at this point in the history
Clean up app icon
Update Welcome Logo
Fix png color profile warnings
Add background for splash logo on dark backgrounds
  • Loading branch information
EricB-Arch committed Dec 7, 2015
1 parent 31e22cb commit e40d1b2
Show file tree
Hide file tree
Showing 14 changed files with 3,143 additions and 10 deletions.
1,292 changes: 1,292 additions & 0 deletions artwork/Logo/gcs_splash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,831 changes: 1,831 additions & 0 deletions artwork/Logo/welcome-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ground/gcs/src/app/resources/gcs_splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 4 additions & 5 deletions ground/gcs/src/crashreporterapp/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</property>
<property name="windowIcon">
<iconset resource="resources.qrc">
<normaloff>:/app/taulabs.ico</normaloff>:/app/taulabs.ico</iconset>
<normaloff>:/app/dronin.ico</normaloff>:/app/dronin.ico</iconset>
</property>
<widget class="QWidget" name="centralWidget">
<layout class="QVBoxLayout" name="verticalLayout">
Expand All @@ -60,10 +60,9 @@
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/pictures/resources/SadPenguin.PNG&quot; width=&quot;120&quot; height=&quot;120&quot; style=&quot;float: left;&quot; /&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Ooops something went wrong and the application needs to be closed.&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Please help us improve this software by sending us the crash report, it will be sent to the project forums so the development team can have a look at what caused the crash and hopefully fix it!&lt;/span&gt;&lt;/p&gt;
&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/pictures/resources/SadPenguin.PNG&quot; width=&quot;120&quot; height=&quot;120&quot; style=&quot;float: left;&quot; /&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:10pt;&quot;&gt;Ooops something went wrong and the application needs to be closed.&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:10pt;&quot;&gt;Please help us improve this software by sending us the crash report, it will be sent to the project forums so the development team can have a look at what caused the crash and hopefully fix it!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openLinks">
<bool>false</bool>
Expand Down
1 change: 1 addition & 0 deletions ground/gcs/src/plugins/coreplugin/coreconstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ 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/dronin_logo_128.png";
const char * const ICON_TAULABS_SM = ":/core/images/dronin.ico";

// wizard kind
const char * const WIZARD_TYPE_FILE = "GCS::WizardType::File";
Expand Down
Binary file not shown.
Binary file modified ground/gcs/src/plugins/coreplugin/images/dronin_logo_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ground/gcs/src/plugins/coreplugin/images/dronin_logo_256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ground/gcs/src/plugins/coreplugin/images/dronin_logo_32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ground/gcs/src/plugins/coreplugin/images/dronin_logo_64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ground/gcs/src/plugins/coreplugin/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ MainWindow::MainWindow() :

setWindowTitle(QLatin1String(Core::Constants::GCS_NAME));
if (!Utils::HostOsInfo::isMacHost())
QApplication::setWindowIcon(QIcon(Core::Constants::ICON_TAULABS));
QApplication::setWindowIcon(QIcon(Core::Constants::ICON_TAULABS_SM));
QCoreApplication::setApplicationName(QLatin1String(Core::Constants::GCS_NAME));
QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::GCS_VERSION_LONG));
QCoreApplication::setOrganizationName(QLatin1String(Core::Constants::GCS_AUTHOR));
Expand Down
11 changes: 10 additions & 1 deletion ground/gcs/src/plugins/coreplugin/workspacesettings.ui
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,16 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
Expand Down
Binary file modified ground/gcs/src/plugins/welcome/qml/images/welcome-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions ground/gcs/src/plugins/welcome/qml/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@ Rectangle {

Image {
x: -55
smooth: false
antialiasing: true
sourceSize.height: 235
sourceSize.width: 234
sourceSize.height: 223
sourceSize.width: 223
source: "images/welcome-logo.png"
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: -16 //it looks better aligned to icons grid
anchors.verticalCenterOffset: -1 //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
Expand Down

0 comments on commit e40d1b2

Please sign in to comment.