summary refs log tree commit diff
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2020-02-02 00:10:18 +0000
committerGitHub <noreply@github.com>2020-02-02 00:10:18 +0000
commit32375518de2c63811dd1320ae57a486dbcee195d (patch)
treee03c9fb5b3e9339e97df99087d568bac0e327508
parentClose popup when clicking outside (diff)
parentUse cleaned up logo (diff)
downloadnheko-32375518de2c63811dd1320ae57a486dbcee195d.tar.xz
Merge pull request #112 from Nheko-Reborn/sharp-logo
Update the logo to not be so asymmetric and add a scalable svg. I hope I fixed all the scaling issues, where the logo isn't pixel aligned in most resolutions. Also fixes an issue, where the blue bar seemed to be misaligned in some resolutions?
-rw-r--r--CMakeLists.txt1
-rw-r--r--resources/login.pngbin5523 -> 5543 bytes
-rw-r--r--resources/login@2x.pngbin11395 -> 11432 bytes
-rw-r--r--resources/nheko-1024.pngbin42770 -> 53595 bytes
-rw-r--r--resources/nheko-128.pngbin5523 -> 5543 bytes
-rw-r--r--resources/nheko-16.pngbin728 -> 696 bytes
-rw-r--r--resources/nheko-256.pngbin11395 -> 11432 bytes
-rw-r--r--resources/nheko-32.pngbin1464 -> 1439 bytes
-rw-r--r--resources/nheko-48.pngbin2299 -> 2116 bytes
-rw-r--r--resources/nheko-512.pngbin24776 -> 25223 bytes
-rw-r--r--resources/nheko-64.pngbin2705 -> 2742 bytes
-rw-r--r--resources/nheko.pngbin24776 -> 24676 bytes
-rw-r--r--resources/nheko.svg155
-rw-r--r--resources/register.pngbin5523 -> 5543 bytes
-rw-r--r--resources/register@2x.pngbin11395 -> 11432 bytes
-rw-r--r--resources/res.qrc1
-rw-r--r--resources/splash.pngbin11395 -> 11432 bytes
-rw-r--r--resources/splash@2x.pngbin24776 -> 25223 bytes
-rw-r--r--src/MainWindow.cpp2
19 files changed, 158 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt

index fe00d570..a7e0ea53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -595,6 +595,7 @@ if(UNIX AND NOT APPLE) install (FILES "resources/nheko-128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "nheko.png") install (FILES "resources/nheko-256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "nheko.png") install (FILES "resources/nheko-512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "nheko.png") + install (FILES "resources/nheko.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "nheko.svg") install (FILES "resources/nheko.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") install (FILES "resources/nheko.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo") diff --git a/resources/login.png b/resources/login.png
index e65084ef..d098a62a 100644 --- a/resources/login.png +++ b/resources/login.png
Binary files differdiff --git a/resources/login@2x.png b/resources/login@2x.png
index 4f89112f..9cbe3c9f 100644 --- a/resources/login@2x.png +++ b/resources/login@2x.png
Binary files differdiff --git a/resources/nheko-1024.png b/resources/nheko-1024.png
index 45b19a62..8a59d5f6 100644 --- a/resources/nheko-1024.png +++ b/resources/nheko-1024.png
Binary files differdiff --git a/resources/nheko-128.png b/resources/nheko-128.png
index e65084ef..d098a62a 100644 --- a/resources/nheko-128.png +++ b/resources/nheko-128.png
Binary files differdiff --git a/resources/nheko-16.png b/resources/nheko-16.png
index deb4449d..7114e060 100644 --- a/resources/nheko-16.png +++ b/resources/nheko-16.png
Binary files differdiff --git a/resources/nheko-256.png b/resources/nheko-256.png
index 4f89112f..9cbe3c9f 100644 --- a/resources/nheko-256.png +++ b/resources/nheko-256.png
Binary files differdiff --git a/resources/nheko-32.png b/resources/nheko-32.png
index ec582489..5fefc6b5 100644 --- a/resources/nheko-32.png +++ b/resources/nheko-32.png
Binary files differdiff --git a/resources/nheko-48.png b/resources/nheko-48.png
index e5aab6ac..726d0356 100644 --- a/resources/nheko-48.png +++ b/resources/nheko-48.png
Binary files differdiff --git a/resources/nheko-512.png b/resources/nheko-512.png
index 3c39b0be..29c3a607 100644 --- a/resources/nheko-512.png +++ b/resources/nheko-512.png
Binary files differdiff --git a/resources/nheko-64.png b/resources/nheko-64.png
index 768921c9..1b5c9eb3 100644 --- a/resources/nheko-64.png +++ b/resources/nheko-64.png
Binary files differdiff --git a/resources/nheko.png b/resources/nheko.png
index 3c39b0be..ae7398a6 100644 --- a/resources/nheko.png +++ b/resources/nheko.png
Binary files differdiff --git a/resources/nheko.svg b/resources/nheko.svg new file mode 100644
index 00000000..46732585 --- /dev/null +++ b/resources/nheko.svg
@@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="1024" + height="1024" + viewBox="0 0 270.93333 270.93333" + version="1.1" + id="svg8" + inkscape:version="0.92.4 5da689c313, 2019-01-14" + sodipodi:docname="nheko.svg" + inkscape:export-filename="/home/nicolas/Dokumente/devel/open-source/nheko/resources/nheko-rebuild-round-corners.svg.png" + inkscape:export-xdpi="130.048" + inkscape:export-ydpi="130.048"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.35355339" + inkscape:cx="852.07808" + inkscape:cy="-60.410565" + inkscape:document-units="mm" + inkscape:current-layer="layer2" + showgrid="true" + inkscape:window-width="1920" + inkscape:window-height="1019" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + showguides="true" + inkscape:snap-grids="true" + gridtolerance="10" + inkscape:snap-bbox="false" + inkscape:bbox-paths="true" + inkscape:snap-global="true" + inkscape:bbox-nodes="true" + inkscape:lockguides="false" + units="px"> + <sodipodi:guide + position="0,0" + orientation="0,793.70079" + id="guide4797" + inkscape:locked="false" /> + <sodipodi:guide + position="0,297" + orientation="1122.5197,0" + id="guide4803" + inkscape:locked="false" /> + <inkscape:grid + type="axonomgrid" + id="grid4805" + units="px" + empspacing="2" + snapvisiblegridlinesonly="true" + spacingy="1.0583333" /> + <sodipodi:guide + position="0,0" + orientation="0,755.90551" + id="guide4807" + inkscape:locked="false" /> + <sodipodi:guide + position="200,0" + orientation="-755.90551,0" + id="guide4809" + inkscape:locked="false" /> + <sodipodi:guide + position="200,200" + orientation="0,-755.90551" + id="guide4811" + inkscape:locked="false" /> + <inkscape:grid + type="xygrid" + id="grid871" + empspacing="2" + color="#d43fff" + opacity="0.1254902" + empcolor="#cf3fff" + empopacity="0.25098039" + units="px" + spacingx="1.0583333" + spacingy="1.0583333" + enabled="false" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Logo" + style="display:inline" + transform="translate(0,-26.066668)"> + <circle + id="path3792" + cx="135.46666" + cy="161.53333" + style="display:inline;fill:#333333;fill-opacity:1;stroke:none;stroke-width:0.3584221" + inkscape:transform-center-x="-57.929751" + inkscape:transform-center-y="532.03976" + inkscape:export-xdpi="96.000008" + inkscape:export-ydpi="96.000008" + r="135.46666" /> + <path + style="fill:#fffffe;fill-opacity:1;stroke:none;stroke-width:0.32663074px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 48.965212,110.73276 H 239.52342 c 4.88824,0 4.88824,0 0,8.46688 L 180.59519,221.2662 c -4.6188,8.00001 -4.6188,8.00001 -9.50702,8.00001 h -19.55294 c -4.88824,0 -4.88824,0 -0.26944,-8.00001 l 44.2635,-76.66608 h -29.41224 l -43.91123,76.19952 c -4.88823,8.46657 -4.88823,8.46657 -9.77646,8.46657 H 29.329398 l 49.299816,-84.66609 h -49.29982 z" + id="path4834" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccc" + inkscape:export-xdpi="96.000008" + inkscape:export-ydpi="96.000008" /> + <path + style="fill:#c0def5;fill-opacity:1;stroke:none;stroke-width:0.3584221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 97.764652,110.73276 H 127.09406 L 58.658797,229.26621 H 29.329398 Z" + id="path4836" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" + inkscape:export-xdpi="96.000008" + inkscape:export-ydpi="96.000008" /> + <path + style="fill:#87aade;fill-opacity:1;stroke:none;stroke-width:0.3584221px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 58.658797,229.26621 127.09406,110.73276 h 29.3294 L 87.988193,229.26621 Z" + id="path4838" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" + inkscape:export-xdpi="96.000008" + inkscape:export-ydpi="96.000008" /> + </g> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + style="display:inline" + transform="translate(0,-26.066668)" /> +</svg> diff --git a/resources/register.png b/resources/register.png
index e65084ef..d098a62a 100644 --- a/resources/register.png +++ b/resources/register.png
Binary files differdiff --git a/resources/register@2x.png b/resources/register@2x.png
index 4f89112f..9cbe3c9f 100644 --- a/resources/register@2x.png +++ b/resources/register@2x.png
Binary files differdiff --git a/resources/res.qrc b/resources/res.qrc
index 0e5f4125..7080fdd6 100644 --- a/resources/res.qrc +++ b/resources/res.qrc
@@ -85,6 +85,7 @@ </qresource> <qresource prefix="/logos"> <file>nheko.png</file> + <file>nheko.svg</file> <file>splash.png</file> <file>splash@2x.png</file> diff --git a/resources/splash.png b/resources/splash.png
index 4f89112f..9cbe3c9f 100644 --- a/resources/splash.png +++ b/resources/splash.png
Binary files differdiff --git a/resources/splash@2x.png b/resources/splash@2x.png
index 3c39b0be..29c3a607 100644 --- a/resources/splash@2x.png +++ b/resources/splash@2x.png
Binary files differdiff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index d400ad8e..1b378ca9 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp
@@ -66,7 +66,7 @@ MainWindow::MainWindow(QWidget *parent) setFont(font); userSettings_ = QSharedPointer<UserSettings>(new UserSettings); - trayIcon_ = new TrayIcon(":/logos/nheko-32.png", this); + trayIcon_ = new TrayIcon(":/logos/nheko.svg", this); welcome_page_ = new WelcomePage(this); login_page_ = new LoginPage(this);