smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SYNERGY-670 Fix logo for Linux and dark logo for macOS (#6884)

Browse source 
* SYNERGY-670 Fix logo for Linux and dark logo for macOS

* Update ChangeLog
This commit is contained in:
SerhiiGadzhilov 2020-12-21 14:09:52 +03:00 committed by GitHub
parent 78582d12d3
commit fbd32a9797
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -7,6 +7,7 @@ Bug fixes:
- #6879 Update macOS installer drive icons
- #6878 Update googletest library to latest version
- #6882 Build macOS using qt 5.15.2 and avoid using brew for build
- #6884 Fix logo for Linux and dark logo for macOS
Enhancements:
- #6867 Create only 1 artefact for macOS

51
res/synergy.svg
View file

@ -1,38 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
<style type="text/css">
.st0{fill:#3F96B9;}
.st1{fill:#5D7DBD;}
.st2{fill:#196260;}
.st3{fill:#97C33D;}
</style>
<path class="st0" d="M479.8651733,295.6200867c4.280304-21.7440796-10.1346741-42.9872894-32.1346741-47.3143921
c-20.2090149-3.9776001-39.8984985,7.7088928-46.2626953,26.5175171c-0.2657166,1.819397-0.5869141,3.6259766-0.9277954,5.4169922
c-14.359314,72.9589844-78.7187195,123.5878906-150.4677124,123.3417969
c11.9520874,11.7431946,17.9570007,29.1700134,14.4520874,46.8984985
c-2.8778992,14.6503906-11.7040863,26.6102905-23.4286957,33.960907
c113.2567902,4.6591797,216.4199066-73.9833984,238.9481964-188.5762024
c0.0186157-0.046814,0.0186157-0.1328125,0.0186157-0.2070007L479.8651733,295.6200867z"/>
<path class="st1" d="M52.7905006,253.030304c22.0043983,4.3378906,43.4062996-9.8677063,47.6694984-31.6538086l0.1128006,0.0332031
c0.0195007-0.0619965,0.0278015-0.0991974,0.0370941-0.1381989
c14.4345016-73.3715973,79.4389038-124.1621017,151.6889038-123.3051987
c-11.7718964-11.7851028-17.6811066-29.0737-14.2055054-46.6987c2.8973999-14.7490005,11.8276062-26.772501,23.6478882-34.1030006
C147.8114929,11.6527996,43.75,90.4897003,21.1063995,205.6504059c-0.4447994,2.2778015-0.7670002,4.5263977-1.1654987,6.7748871
C19.4862995,231.7026062,33.0625,249.1470032,52.7905006,253.030304"/>
<path class="st2" d="M292.0644836,20.6728992c-20.2285767-1.7939987-39.074295,12.1518002-43.1093903,32.7309036
c-4.1567993,21.1807022,8.8368988,41.7406998,29.2256012,47.0824966c0.6445007,0.1075058,1.2607117,0.1739044,1.875,0.297905
c73.0174866,14.3656998,123.6845093,78.8265915,123.3251953,150.6473999
c11.781189-11.6268921,28.9794922-17.4261932,46.4813843-13.9848022
c14.905304,2.9082031,27.045929,12.0049133,34.3203125,24.0131989
c5.2842102-113.726593-73.4912109-217.5790863-188.4902039-240.1850891
C294.4892883,21.0429993,293.2772827,20.8974991,292.0644836,20.6728992"/>
<path class="st3" d="M253.6903992,448.3398132c4.1397095-21.1210022-8.8070984-41.6318054-29.1313019-47.0107117
c-1.1542969-0.2275085-2.3296051-0.3594055-3.4653015-0.5878906
c-73.319397-14.4326172-124.0634995-79.3623047-123.3247986-151.5361176
c-11.7796936,12.0742035-29.282196,18.1923981-47.1146965,14.6786957
c-14.5078011-2.8398743-26.3838005-11.5165863-33.7490005-23.0741882
C12.0292997,354.2412109,90.7045975,457.6582031,205.457489,480.2354126c1.6768036,0.3026733,3.324707,0.5692749,4.9922028,0.852478
C230.7157898,482.9267883,249.6190948,468.9472961,253.6903992,448.3398132"/>
<svg width="800" height="800" viewBox="0 0 67 67" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0)">
<path d="M26.2192 59.4389C29.1145 60.2147 32.0905 58.4965 32.8663 55.6012C33.6421 52.7059 31.9239 49.7299 29.0286 48.9541C26.1333 48.1783 23.1573 49.8965 22.3815 52.7918C21.6057 55.6871 23.3239 58.6631 26.2192 59.4389Z" fill="white"/>
<path d="M10.866 32.8547C13.7613 33.6305 16.7373 31.9123 17.5131 29.017C18.2889 26.1217 16.5707 23.1456 13.6754 22.3699C10.78 21.5941 7.80403 23.3123 7.02824 26.2076C6.25244 29.1029 7.97065 32.0789 10.866 32.8547Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M40.2623 7.02466C54.7002 10.8933 63.2922 25.7342 59.4721 40.1746L59.4508 40.2602C58.6756 43.1534 55.6969 44.8732 52.8037 44.098C49.9089 43.3223 48.1908 40.344 48.966 37.4508L48.978 37.3996C51.2701 28.734 46.1143 19.8303 37.4529 17.5095L37.4856 17.5183C40.3689 18.2715 43.3278 16.5535 44.1 13.6718C44.8721 10.7901 43.1686 7.82274 40.295 7.03345L40.2623 7.02466Z" fill="#33CC99"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4477 40.2596C55.579 54.6975 40.7381 63.2895 26.2977 59.4694L26.2121 59.4482C23.3189 58.673 21.5991 55.6942 22.3744 52.8011C23.15 49.9063 26.1283 48.1881 29.0215 48.9633L29.0727 48.9754C37.7384 51.2675 46.642 46.1116 48.9628 37.4502L48.9541 37.483C48.2008 40.3662 49.9189 43.3252 52.8006 44.0973C55.6822 44.8695 58.6496 43.166 59.4389 40.2924L59.4477 40.2596Z" fill="#33B2CC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M26.2122 59.4478C11.7743 55.5791 3.1823 40.7382 7.00243 26.2978L7.02366 26.2122C7.79888 23.319 10.7776 21.5992 13.6708 22.3744C16.5656 23.1501 18.2837 26.1284 17.5085 29.0216L17.4965 29.0728C15.2044 37.7384 20.3602 46.6421 29.0216 48.9629L28.9888 48.9541C26.1056 48.2009 23.1467 49.9189 22.3745 52.8006C21.6024 55.6823 23.3059 58.6497 26.1794 59.439L26.2122 59.4478Z" fill="#87D639"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.02333 26.2125C10.892 11.7745 25.7329 3.18253 40.1733 7.00266L40.2589 7.02389C43.1521 7.79911 44.8719 10.7778 44.0966 13.671C43.321 16.5658 40.3427 18.2839 37.4495 17.5087L37.3983 17.4967C28.7327 15.2046 19.829 20.3604 17.5082 29.0219L17.517 28.9891C18.2702 26.1058 16.5521 23.1469 13.6704 22.3747C10.7888 21.6026 7.82141 23.3061 7.03212 26.1797L7.02333 26.2125Z" fill="#3B67D3"/>
</g>
<defs>
<clipPath id="clip0">
<rect width="54.2735" height="54.2735" fill="white" transform="translate(14.047) rotate(15)"/>
</clipPath>
</defs>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

1
src/gui/res/Synergy.qrc
View file

@ -7,6 +7,7 @@
<file>icons/16x16/warning.png</file>
<file>icons/256x256/synergy.ico</file>
<file>image/about.png</file>
<file>image/about-dark.png</file>
<file>lang/Languages.xml</file>
<file>icons/16x16/money.png</file>
<file>image/spinning-wheel.gif</file>

BIN
src/gui/res/icons/16x16/synergy-connected.psd
View file

Binary file not shown.

BIN
src/gui/res/icons/16x16/synergy-disconnected.psd
View file

Binary file not shown.

BIN
src/gui/res/image/about-dark.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.1 KiB

10
src/gui/src/AboutDialog.cpp
View file

@ -21,6 +21,8 @@
#include <QtCore>
#include <QtGui>
#include "OSXHelpers.h"
AboutDialog::AboutDialog(QWidget* parent, const QString& synergyApp) :
QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
Ui::AboutDialogBase()
@ -58,6 +60,14 @@ Visit our website for help and info (symless.com).
setMaximumSize(size);
setMinimumSize(size);
resize(size);
if (isOSXInterfaceStyleDark()) {
QPixmap logo(":/res/image/about-dark.png");
if (!logo.isNull()) {
label_Logo->setPixmap(logo);
}
}
#elif defined(Q_OS_LINUX)
QSize size(600, 330);
setMaximumSize(size);

3
src/gui/src/AboutDialogBase.ui
View file

@ -177,7 +177,7 @@
</spacer>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="label_Logo">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -208,7 +208,6 @@
</widget>
<resources>
<include location="../res/Synergy.qrc"/>
<include location="Synergy.qrc"/>
</resources>
<connections>
<connection>