Merge pull request #6505

df9c2ee [Qt] replace wifi icon with network symbol (Marco)
9142867 [QT] cleanup icons (Marco)

contrib/devtools/optimize-pngs.py

@@ -1,5 +1,8 @@
 #!/usr/bin/env python
-
+'''
+Run this scrip every time you change one of the png files. Using pngcrush, it will optimize the png files, remove various color profiles, remove ancillary chunks (alla) and text chunks (text).
+#pngcrush -brute -ow -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem alla -rem text
+'''
 import os
 import sys
 import subprocess
@@ -18,14 +21,12 @@ def content_hash(filename):
     data = i.tostring()
     return hashlib.sha256(data).hexdigest()
 
-#optimize png, remove various color profiles, remove ancillary chunks (alla) and text chunks (text)
-#pngcrush -brute -ow -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem alla -rem text
-
 pngcrush = 'pngcrush'
 git = 'git'
-folders = ["src/qt/res/movies", "src/qt/res/icons", "src/qt/res/images"]
+folders = ["src/qt/res/movies", "src/qt/res/icons"]
 basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel']).rstrip('\n')
 totalSaveBytes = 0
+noHashChange = True
 
 outputArray = []
 for folder in folders:
@@ -68,6 +69,7 @@ def content_hash(filename):
     oldHash = fileDict['sha256Old']
     newHash = fileDict['sha256New']
     totalSaveBytes += fileDict['osize'] - fileDict['psize']
+    noHashChange = noHashChange and (oldHash == newHash)
     print fileDict['file']+"\n  size diff from: "+str(fileDict['osize'])+" to: "+str(fileDict['psize'])+"\n  old sha256: "+oldHash+"\n  new sha256: "+newHash+"\n"
 
-print "completed. Total reduction: "+str(totalSaveBytes)+" bytes"
+print "completed. Checksum stable: "+str(noHashChange)+". Total reduction: "+str(totalSaveBytes)+" bytes"

doc/assets-attribution.md

@@ -10,37 +10,58 @@ The following is a list of assets used in the bitcoin source and their proper at
 * Site: [https://github.com/stephenhutchings/typicons.font](https://github.com/stephenhutchings/typicons.font)
 
 ### Assets Used
-	src/qt/res/icons/add.png, src/qt/res/icons/address-book.png,
-	src/qt/res/icons/configure.png, src/qt/res/icons/connect4.png,
-    src/qt/res/icons/debugwindow.png, src/qt/res/icons/edit.png,
-    src/qt/res/icons/exitcopy.png, src/qt/res/icons/editpaste.png,
-    src/qt/res/icons/export.png, src/qt/res/icons/eye.png,
-    src/qt/res/icons/filesave.png, src/qt/res/icons/history.png,
-    src/qt/res/icons/info.png, src/qt/res/icons/key.png,
-    src/qt/res/icons/lock_*.png, src/qt/res/icons/open.png,
-    src/qt/res/icons/overview.png, src/qt/res/icons/quit.png,
-    src/qt/res/icons/receive.png, src/qt/res/icons/remove.png,
-    src/qt/res/icons/send.png, src/qt/res/icons/synced.png,
-    src/qt/res/icons/transaction*.png, src/qt/res/icons/tx_output.png,
+    src/qt/res/icons/add.png
+    src/qt/res/icons/address-book.png,
+    src/qt/res/icons/configure.png
+    src/qt/res/icons/debugwindow.png
+    src/qt/res/icons/edit.png,
+    src/qt/res/icons/exitcopy.png
+    src/qt/res/icons/editpaste.png,
+    src/qt/res/icons/export.png
+    src/qt/res/icons/eye.png,
+    src/qt/res/icons/filesave.png
+    src/qt/res/icons/history.png,
+    src/qt/res/icons/info.png
+    src/qt/res/icons/key.png,
+    src/qt/res/icons/lock_*.png
+    src/qt/res/icons/open.png,
+    src/qt/res/icons/overview.png
+    src/qt/res/icons/quit.png,
+    src/qt/res/icons/receive.png
+    src/qt/res/icons/remove.png,
+    src/qt/res/icons/send.png
+    src/qt/res/icons/synced.png,
+    src/qt/res/icons/transaction*.png
+    src/qt/res/icons/tx_output.png,
     src/qt/res/icons/warning.png
 
-Jonas Schnelli
+Other
 -----------------------
 
 ### Info
-* Designer: Jonas Schnelli
-* Bitcoin Icon: (based on the original bitcoin logo from Bitboy)
+* Designer: Jonas Schnelli, Bitboy, Stephen Hutchings, Marco Falke
+* Bitcoin Icon: Based on the original bitcoin logo from Bitboy
+* Network connection icon: Inspired by flow-merge.svg from Stephen Hutchings
 * Some icons are based on Stephan Hutchings Typicons
 * License: MIT
 
 ### Assets Used
-    src/qt/res/icons/about.png, src/qt/res/icons/about_qt.png,
-    src/qt/res/icons/bitcoin.icns, src/qt/res/icons/bitcoin.ico,
-    src/qt/res/icons/bitcoin.png, src/qt/res/icons/clock*.png,
-    src/qt/res/icons/connect[0-3].png, src/qt/res/icons/eye_minus.png,
-    src/qt/res/icons/eye_plus.png, src/qt/res/icons/verify.png,
-    src/qt/res/icons/tx_inout.png, src/qt/res/icons/tx_input.png,
-    src/qt/res/src/verify.svg, src/qt/res/src/bitcoin.svg,
-    src/qt/res/src/clock*.svg, src/qt/res/src/connect*.svg,
-    src/qt/res/src/mine.svg, src/qt/res/src/qt.svg, src/qt/res/src/tx*.svg,
-    src/qt/res/src/verify.svg,
+    src/qt/res/icons/about.png
+    src/qt/res/icons/about_qt.png,
+    src/qt/res/icons/bitcoin.icns
+    src/qt/res/icons/bitcoin.ico,
+    src/qt/res/icons/bitcoin.png
+    src/qt/res/icons/clock*.png,
+    src/qt/res/icons/connect*.png
+    src/qt/res/icons/eye_minus.png,
+    src/qt/res/icons/eye_plus.png
+    src/qt/res/icons/verify.png,
+    src/qt/res/icons/tx_inout.png
+    src/qt/res/icons/tx_input.png,
+    src/qt/res/src/bitcoin.svg,
+    src/qt/res/src/clock*.svg
+    src/qt/res/src/connect*.svg,
+    src/qt/res/src/mine.svg
+    src/qt/res/src/qt.svg
+    src/qt/res/src/tx*.svg,
+    src/qt/res/src/verify.svg