GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changing Elements Icon to just the graphic without text, fixing issue with gitian builds on icon, removing color change based on testnet for Elements, and compatible svg with build script.

Browse source
This commit is contained in:
Allen Piscitello 2020-04-10 12:50:22 -05:00
parent 1427dfd6e7
commit 45fb119783
3 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Makefile.am
View file

@ -718,7 +718,7 @@ EXTRA_DIST += $(RES_RENDERED_ICON_SRC) $(RES_ALL_RENDERED_ICONS)
if CAN_RENDER_ICONS
qt/res/rendered_icons/about.png: qt/res/rendered_icons/about.svg
$(RSVG_CONVERT) -f png -d 142 -p 142 < $< | $(IMAGEMAGICK_CONVERT) - -crop 64x78+0+31 -bordercolor transparent -border 7x0 -colorspace Gray -strip $@
$(RSVG_CONVERT) -f png -d 142 -p 142 < $< | $(IMAGEMAGICK_CONVERT) - -bordercolor transparent -colorspace Gray -strip $@
qt/res/rendered_icons/about.svg: qt/res/src/bitcoin.svg
@$(MKDIR_P) $(@D)
@ -739,14 +739,14 @@ qt/res/rendered_icons/bitcoin.ico: qt/res/rendered_icons/bitcoin32d8.gif $(patsu
$(IMAGEMAGICK_CONVERT) $^ $@
qt/res/rendered_icons/bitcoin_testnet.ico: qt/res/rendered_icons/bitcoin.ico
$(IMAGEMAGICK_CONVERT) $^ -modulate 100,87,9 $@
$(IMAGEMAGICK_CONVERT) $^ $@
qt/res/rendered_icons/nsis-wizard.svg: qt/res/src/bitcoin.svg
@$(MKDIR_P) $(@D)
sed '/fill="#000"/d' < $< > $@
qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/nsis-wizard.svg
$(RSVG_CONVERT) -f png -d 360 -p 360 < $< | $(IMAGEMAGICK_CONVERT) - -crop 164x290+0+35 -border 0x12 -strip BMP3:$@
$(RSVG_CONVERT) -f png -d 360 -p 360 < $< | $(IMAGEMAGICK_CONVERT) - -strip BMP3:$@
endif

45
src/qt/res/src/bitcoin.svg
View file

@ -1,17 +1,28 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 90 90" width="1in" height="1in">
<defs>
<style>.cls-1{fill:#5caadd;}.cls-2{fill:#6d8ac5;}.cls-3{fill:#7a4596;}.cls-4{fill:#5f53a2;}.cls-5{fill:#111316;}</style>
</defs>
<polygon class="cls-1" points="6.86 42.4 17.17 36.46 10.19 32.42 0 38.3 6.86 42.4"/>
<polygon class="cls-2" points="6.86 42.4 6.86 53.87 0 49.91 0 38.3 6.86 42.4"/>
<polygon class="cls-3" points="17.2 47.96 6.89 53.91 13.87 57.94 24.06 52.06 17.2 47.96"/>
<polygon class="cls-4" points="17.2 47.96 17.21 36.49 24.07 40.45 24.06 52.06 17.2 47.96"/>
<path class="cls-5" d="M30.27,51.23V41.14h6.44v1.38H31.8v2.94H36v1.36H31.8v3h4.91v1.38Z"/>
<path class="cls-5" d="M40.67,51.23a1.83,1.83,0,0,1-2-2v-8.1h1.44v8c0,.55.2.83.78.83h.64v1.24Z"/>
<path class="cls-5" d="M44.25,48.05a1.76,1.76,0,0,0,1.83,2,2.15,2.15,0,0,0,1.74-.73l.92.86a3.36,3.36,0,0,1-2.69,1.12c-1.8,0-3.23-1-3.23-3.68,0-2.32,1.2-3.67,3-3.67s3,1.42,3,3.46v.63Zm3-2a1.49,1.49,0,0,0-1.42-.91,1.51,1.51,0,0,0-1.43.91,2.26,2.26,0,0,0-.18,1h3.23A2.41,2.41,0,0,0,47.28,46.07Z"/>
<path class="cls-5" d="M59.6,51.23V46.85c0-1.12-.63-1.6-1.44-1.6a1.43,1.43,0,0,0-1.49,1.53v4.45H55.23V46.85a1.4,1.4,0,0,0-1.45-1.6,1.43,1.43,0,0,0-1.48,1.6v4.38H50.85V44h1.42v.73A2.58,2.58,0,0,1,54.18,44a2.28,2.28,0,0,1,2,1,2.72,2.72,0,0,1,2.25-1,2.58,2.58,0,0,1,1.81.65,2.65,2.65,0,0,1,.77,2v4.59Z"/>
<path class="cls-5" d="M64.35,48.05a1.76,1.76,0,0,0,1.83,2,2.13,2.13,0,0,0,1.74-.73l.92.86a3.36,3.36,0,0,1-2.69,1.12c-1.8,0-3.23-1-3.23-3.68,0-2.32,1.2-3.67,3-3.67s3,1.42,3,3.46v.63Zm3-2A1.46,1.46,0,0,0,66,45.16a1.49,1.49,0,0,0-1.43.91,2.26,2.26,0,0,0-.19,1h3.23A2.25,2.25,0,0,0,67.38,46.07Z"/>
<path class="cls-5" d="M75.33,51.23V46.85a1.4,1.4,0,0,0-1.45-1.6,1.43,1.43,0,0,0-1.48,1.6v4.38H71V44h1.42v.73A2.55,2.55,0,0,1,74.28,44a2.48,2.48,0,0,1,1.77.65,2.65,2.65,0,0,1,.72,2v4.59Z"/>
<path class="cls-5" d="M81.18,51.23a1.87,1.87,0,0,1-2-2V45.28h-.82V44.17h.82V42h1.45v2.18H82v1.11H80.66v3.88a.72.72,0,0,0,.79.83H82v1.24Z"/>
<path class="cls-5" d="M86.55,51.31a4,4,0,0,1-3-1l1-1a2.81,2.81,0,0,0,2.07.75c.88,0,1.57-.31,1.57-1,0-.48-.27-.8-1-.85L86,48.14c-1.34-.11-2.12-.72-2.12-2s1.2-2.2,2.7-2.2a4,4,0,0,1,2.67.81l-.91.92a2.72,2.72,0,0,0-1.77-.53c-.87,0-1.31.39-1.31.93s.23.75,1,.82l1.13.1c1.34.11,2.14.75,2.14,2C89.54,50.53,88.26,51.31,86.55,51.31Z"/>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 24.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns="http://www.w3.org/2000/svg"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
viewBox="0 0 200.75 100.85"
width="1in"
height="1in">
<g
id="g10"
transform="matrix(0.44627788,0,0,0.44786611,-85.879878,-173.08986)"><polygon
points="330.67,458.41 502.53,359.29 386.19,292.03 216.3,390.04 "
id="polygon2"
fill="#5caadd" /><polygon
points="330.67,458.41 330.61,649.68 216.23,583.58 216.3,390.04 "
id="polygon4"
fill="#6d8ac5" /><polygon
points="503.04,551.1 331.18,650.25 447.52,717.48 617.39,619.5 "
id="polygon6"
fill="#7a4596" /><polygon
points="503.04,551.1 503.1,359.86 617.48,425.95 617.39,619.5 "
id="polygon8"
fill="#5f53a2" /></g></svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 887 B

Before After
Before After

2
src/qt/splashscreen.cpp
View file

@ -65,7 +65,7 @@ SplashScreen::SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const Netw
// draw the bitcoin icon, expected size of PNG: 1024x1024
int _32 = 32 / devicePixelRatio;
QRect rectIcon(QPoint(_32,-_32/2), QSize(pixmap.size().height()/devicePixelRatio+_32*2,pixmap.size().height()/devicePixelRatio+_32*2));
QRect rectIcon(QPoint(0, 0), QSize(pixmap.size().height()/(2*devicePixelRatio)+_32*2, pixmap.size().height()/(2 * devicePixelRatio)+_32*2));
const QSize requiredSize(1024,1024);
QPixmap icon(networkStyle->getAppIcon().pixmap(requiredSize));