Merge pull request #6791

d0321a4 [doc] trivial: fix markdown syntax in qa/rpc-tests/README.md (MarcoFalke)
60a8b70 [doc] trivial: developer-notes.md covers more than just coding standards (MarcoFalke)
3507992 [trivial] Make optimize-pngs.py also cover share/pixmaps (MarcoFalke)
8a320c7 [trivial] Remove obsolete share/qt/make_windows_icon.sh (MarcoFalke)
This commit is contained in:
Wladimir J. van der Laan 2015-10-13 11:50:25 +02:00
commit 16faccb736
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
4 changed files with 7 additions and 16 deletions

View File

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/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). Run this script 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 #pngcrush -brute -ow -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem alla -rem text
''' '''
import os import os
@ -18,12 +18,12 @@ def content_hash(filename):
'''Return hash of RGBA contents of image''' '''Return hash of RGBA contents of image'''
i = Image.open(filename) i = Image.open(filename)
i = i.convert('RGBA') i = i.convert('RGBA')
data = i.tostring() data = i.tobytes()
return hashlib.sha256(data).hexdigest() return hashlib.sha256(data).hexdigest()
pngcrush = 'pngcrush' pngcrush = 'pngcrush'
git = 'git' git = 'git'
folders = ["src/qt/res/movies", "src/qt/res/icons"] folders = ["src/qt/res/movies", "src/qt/res/icons", "share/pixmaps"]
basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel']).rstrip('\n') basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel']).rstrip('\n')
totalSaveBytes = 0 totalSaveBytes = 0
noHashChange = True noHashChange = True

View File

@ -1,5 +1,5 @@
Coding Standards Developer Notes
================ ===============
Various coding styles have been used during the history of the codebase, Various coding styles have been used during the history of the codebase,
and the result is not very consistent. However, we're now trying to converge to and the result is not very consistent. However, we're now trying to converge to

View File

@ -37,11 +37,11 @@ Helper functions for creating blocks and transactions.
Notes Notes
===== =====
You can run any single test by calling qa/pull-tester/rpc-tests.py <testname> You can run any single test by calling `qa/pull-tester/rpc-tests.py <testname>`.
Or you can run any combination of tests by calling `qa/pull-tester/rpc-tests.py <testname1> <testname2> <testname3> ...` Or you can run any combination of tests by calling `qa/pull-tester/rpc-tests.py <testname1> <testname2> <testname3> ...`
Run the regression test suite with `qa/pull-tester/rpc-tests.py' Run the regression test suite with `qa/pull-tester/rpc-tests.py`
Run all possible tests with `qa/pull-tester/rpc-tests.py -extended` Run all possible tests with `qa/pull-tester/rpc-tests.py -extended`

View File

@ -1,9 +0,0 @@
#!/bin/bash
# create multiresolution windows icon
ICON_SRC=../../src/qt/res/icons/bitcoin.png
ICON_DST=../../src/qt/res/icons/bitcoin.ico
convert ${ICON_SRC} -resize 16x16 bitcoin-16.png
convert ${ICON_SRC} -resize 32x32 bitcoin-32.png
convert ${ICON_SRC} -resize 48x48 bitcoin-48.png
convert bitcoin-16.png bitcoin-32.png bitcoin-48.png ${ICON_DST}