GUI: Liquid branding

ElementsProject · Apr 10, 2019 · 6879be7 · 6879be7
1 parent 3f1764a
commit 6879be7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 63 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -638,20 +638,21 @@ RES_RENDERED_ICONS = \
 
 RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \
   qt/res/rendered_icons/about.svg \
-  $(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 290 512 1024) \
+  $(patsubst %,qt/res/rendered_icons/bitcoin%.png,16 32 48 256 512 1024) \
   qt/res/rendered_icons/bitcoin.icns \
+  qt/res/rendered_icons/nsis-wizard.svg \
   qt/res/rendered_icons/nsis-wizard.bmp
 
 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 128x128+7+7 -colorspace Gray -strip $@
+	$(RSVG_CONVERT) -f png -d 142 -p 142 < $< | $(IMAGEMAGICK_CONVERT) - -crop 64x78+0+31 -bordercolor transparent -border 7x0 -colorspace Gray -strip $@
 
 qt/res/rendered_icons/about.svg: qt/res/src/bitcoin.svg
 	@$(MKDIR_P) $(@D)
-	sed '/fill="white"/d;s/\(stop-color:\)#....../\1black/' < $< > $@
+	sed '/fill="#000"/d;s/fill="[^"]*"//g' < $< > $@
 
 qt/res/rendered_icons/bitcoin%.png: qt/res/src/bitcoin.svg
 	@$(MKDIR_P) $(@D)
@@ -670,8 +671,12 @@ qt/res/rendered_icons/bitcoin.ico: qt/res/rendered_icons/bitcoin32d8.gif $(patsu
 qt/res/rendered_icons/bitcoin_testnet.ico: qt/res/rendered_icons/bitcoin.ico
 	$(IMAGEMAGICK_CONVERT) $^ -modulate 100,87,9 $@
 
-qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
-	$(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
+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:$@
 
 endif
 

diff --git a/src/qt/res/src/bitcoin.svg b/src/qt/res/src/bitcoin.svg
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
@@ -69,7 +69,7 @@ SplashScreen::SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const Netw
     pixPaint.fillRect(rGradient, gradient);
 
     // draw the bitcoin icon, expected size of PNG: 1024x1024
-    QRect rectIcon(QPoint(-150,-122), QSize(430,430));
+    QRect rectIcon(QPoint(32,-32), QSize(pixmap.size().height()+64,pixmap.size().height()+64));
 
     const QSize requiredSize(1024,1024);
     QPixmap icon(networkStyle->getAppIcon().pixmap(requiredSize));