From 8a320c7956f1cb051305a7664d7c6bb8d555e5e7 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 26 Sep 2015 17:57:51 +0200 Subject: [PATCH 1/4] [trivial] Remove obsolete share/qt/make_windows_icon.sh --- share/qt/make_windows_icon.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 share/qt/make_windows_icon.sh diff --git a/share/qt/make_windows_icon.sh b/share/qt/make_windows_icon.sh deleted file mode 100755 index bf607b1c6..000000000 --- a/share/qt/make_windows_icon.sh +++ /dev/null @@ -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} - From 3507992bcfd5a6b24355d9f652e5e249db725e44 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 26 Sep 2015 18:01:28 +0200 Subject: [PATCH 2/4] [trivial] Make optimize-pngs.py also cover share/pixmaps Also fix: "Exception: tostring() has been removed. Please call tobytes() instead." --- contrib/devtools/optimize-pngs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/devtools/optimize-pngs.py b/contrib/devtools/optimize-pngs.py index b6d6a097d..799e0cc7d 100755 --- a/contrib/devtools/optimize-pngs.py +++ b/contrib/devtools/optimize-pngs.py @@ -1,6 +1,6 @@ #!/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 ''' import os @@ -18,12 +18,12 @@ def content_hash(filename): '''Return hash of RGBA contents of image''' i = Image.open(filename) i = i.convert('RGBA') - data = i.tostring() + data = i.tobytes() return hashlib.sha256(data).hexdigest() pngcrush = 'pngcrush' 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') totalSaveBytes = 0 noHashChange = True From 60a8b70585d426d55ded88309c87d14c210e7032 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 26 Sep 2015 18:25:54 +0200 Subject: [PATCH 3/4] [doc] trivial: developer-notes.md covers more than just coding standards --- doc/developer-notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/developer-notes.md b/doc/developer-notes.md index 8302a7856..a649b3af4 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -1,5 +1,5 @@ -Coding Standards -================ +Developer Notes +=============== 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 From d0321a4cfdd660b8335b5d7f14556fb2ec60af22 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 8 Oct 2015 14:54:22 +0200 Subject: [PATCH 4/4] [doc] trivial: fix markdown syntax in qa/rpc-tests/README.md --- qa/rpc-tests/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/rpc-tests/README.md b/qa/rpc-tests/README.md index 3391ee03a..d2db00362 100644 --- a/qa/rpc-tests/README.md +++ b/qa/rpc-tests/README.md @@ -37,11 +37,11 @@ Helper functions for creating blocks and transactions. Notes ===== -You can run any single test by calling qa/pull-tester/rpc-tests.py +You can run any single test by calling `qa/pull-tester/rpc-tests.py `. Or you can run any combination of tests by calling `qa/pull-tester/rpc-tests.py ...` -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`