diff options
| -rw-r--r-- | doc/assets-attribution.txt | 4 | ||||
| -rw-r--r-- | doc/release-process.txt | 17 | ||||
| -rw-r--r-- | src/qt/res/icons/bitcoin.icns | bin | 99044 -> 919273 bytes | |||
| -rw-r--r-- | src/qt/res/icons/bitcoin.svg | 58 | ||||
| -rw-r--r-- | src/qt/rpcconsole.cpp | 12 |
5 files changed, 74 insertions, 17 deletions
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index 0693d535c3..a6b98851fc 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -55,3 +55,7 @@ Icon: src/qt/res/icons/debugwindow.png Designer: Vignoni David Site: http://www.oxygen-icons.org/ License: Oxygen icon theme is dual licensed. You may copy it under the Creative Common Attribution-ShareAlike 3.0 License or the GNU Library General Public License. + +Icon: src/qt/res/icons/bitcoin.icns, src/qt/res/icons/bitcoin.psd, src/qt/res/icons/bitcoin.svg +Designer: Jonas Schnelli (original bitcoin logo from Bitboy) +License: MIT
\ No newline at end of file diff --git a/doc/release-process.txt b/doc/release-process.txt index 166f2aaf3c..29271ad224 100644 --- a/doc/release-process.txt +++ b/doc/release-process.txt @@ -1,25 +1,26 @@ -* update translations (ping tcatm on IRC for now) +* update translations (ping wumpus, Diapolo or tcatm on IRC) + * see https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md#syncing-with-transifex * update (commit) version in sources bitcoin-qt.pro - src/clientversion.h (change CLIENT_VERSION_IS_RELEASE to true) - share/setup.nsi - doc/README* contrib/verifysfbinaries/verify.sh + doc/README* + share/setup.nsi + src/clientversion.h (change CLIENT_VERSION_IS_RELEASE to true) * tag version in git - git tag -a v0.5.1 + git tag -a v0.8.0 -* write release notes. git shortlog helps a lot: +* write release notes. git shortlog helps a lot, for example: - git shortlog --no-merges v0.5.0.. + git shortlog --no-merges v0.7.2..v0.8.0 * perform gitian builds * From a directory containing the bitcoin source, gitian-builder and gitian.sigs export SIGNER=(your gitian key, ie bluematt, sipa, etc) - export VERSION=0.5.1 + export VERSION=0.8.0 cd ./gitian-builder * Fetch and build inputs: (first time, or when dependency versions change) diff --git a/src/qt/res/icons/bitcoin.icns b/src/qt/res/icons/bitcoin.icns Binary files differindex 3c757080aa..54d02d34dd 100644 --- a/src/qt/res/icons/bitcoin.icns +++ b/src/qt/res/icons/bitcoin.icns diff --git a/src/qt/res/icons/bitcoin.svg b/src/qt/res/icons/bitcoin.svg new file mode 100644 index 0000000000..14cf0c5e11 --- /dev/null +++ b/src/qt/res/icons/bitcoin.svg @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Designer: Jonas Schnelli
+ License: MIT
+-->
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+ id="svg2" sodipodi:docname="bitcoin-logo-noshadow.svg" inkscape:version="0.48.2 r9819" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1024px" height="1024px"
+ viewBox="-34 -34 580 580" enable-background="new 0 0 1024 1024" xml:space="preserve">
+
+ <!-- nice shadow with alpha 0.35 -->
+ <filter id="dropShadowAlpha">
+ <feColorMatrix result="matrixOut" in="SourceAlpha" type="saturate"
+ values="0.1" />
+ <feGaussianBlur in="matrixOut" result="blur-out" stdDeviation="6" />
+ <feColorMatrix in="blur-out" result="color-out" type="matrix"
+ values="0 0 0 0 0
+ 0 0 0 0 0
+ 0 0 0 0 0
+ 0 0 0 0.35 0"/>
+ <feBlend in="SourceGraphic" in2="color-out" mode="normal" />
+ </filter>
+
+ <g>
+ <!-- white background circle for making B not transparent but still keep inner shadows -->
+ <circle cx="255" cy="255" r="200" stroke-width="2" fill="white"/>
+
+ <radialGradient id="innerBtop" cx="277.4905" cy="196.4412" r="34.3969" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#F9AA4B"/>
+ <stop offset="1" style="stop-color:#F7931A"/>
+ </radialGradient>
+ <path fill="url(#innerBtop)" filter="url(#dropShadowAlpha)" d="M254.647,174.6l-13.983,56.08c15.855,3.951,64.735,20.071,72.656-11.656
+ C321.568,185.928,270.503,178.552,254.647,174.6z"/>
+
+ <radialGradient id="innerBbottom" cx="261.9153" cy="284.5671" r="39.8381" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#F9AA4B"/>
+ <stop offset="1" style="stop-color:#F7931A"/>
+ </radialGradient>
+ <path fill="url(#innerBbottom)" filter="url(#dropShadowAlpha)" d="M233.608,258.984l-15.425,61.832c19.04,4.729,77.769,23.584,86.448-11.296
+ C313.703,273.144,252.647,263.736,233.608,258.984z"/>
+
+ <radialGradient id="coinShape" cx="256.0276" cy="256.0027" r="255.9878" gradientUnits="userSpaceOnUse">
+ <stop offset="0" style="stop-color:#F9AA4B"/>
+ <stop offset="1" style="stop-color:#F7931A"/>
+ </radialGradient>
+ <path fill="url(#coinShape)" filter="url(#dropShadowAlpha)" d="M317.871,7.656c-137.12-34.192-276.024,49.28-310.2,186.44
+ c-34.208,137.136,49.256,276.048,186.36,310.24c137.16,34.199,276.063-49.265,310.256-186.408
+ C538.479,180.776,455.023,41.848,317.871,7.656z M368.807,219.528c-3.688,24.936-17.512,37.008-35.864,41.24
+ c25.2,13.12,38.024,33.239,25.809,68.12c-15.16,43.319-51.176,46.976-99.072,37.912l-11.624,46.584l-28.088-7l11.472-45.96
+ c-7.279-1.809-14.72-3.729-22.384-5.809l-11.512,46.177l-28.056-7l11.624-46.673c-6.561-1.68-13.225-3.464-20.024-5.168
+ l-36.552-9.111l13.943-32.152c0,0,20.696,5.504,20.416,5.096c7.952,1.969,11.48-3.216,12.872-6.672l18.368-73.64l0.048-0.2
+ l13.104-52.568c0.344-5.968-1.712-13.496-13.088-16.336c0.439-0.296-20.4-5.072-20.4-5.072l7.472-30l38.736,9.673l-0.032,0.144
+ c5.824,1.448,11.824,2.824,17.937,4.216L245.423,89.2l28.072,7l-11.28,45.224c7.536,1.721,15.12,3.456,22.504,5.297l11.2-44.929
+ l28.088,7l-11.504,46.145C347.967,167.152,373.904,185.464,368.807,219.528z"/>
+ </g>
+</svg>
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index c9ce374346..50f22b877a 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -38,7 +38,6 @@ class RPCExecutor : public QObject Q_OBJECT public slots: - void start(); void request(const QString &command); signals: @@ -47,11 +46,6 @@ signals: #include "rpcconsole.moc" -void RPCExecutor::start() -{ - // Nothing to do -} - /** * Split shell command line into a list of arguments. Aims to emulate \c bash and friends. * @@ -187,6 +181,7 @@ void RPCExecutor::request(const QString &command) RPCConsole::RPCConsole(QWidget *parent) : QDialog(parent), ui(new Ui::RPCConsole), + clientModel(0), historyPtr(0) { ui->setupUi(this); @@ -384,16 +379,15 @@ void RPCConsole::browseHistory(int offset) void RPCConsole::startExecutor() { - QThread* thread = new QThread; + QThread *thread = new QThread; RPCExecutor *executor = new RPCExecutor(); executor->moveToThread(thread); - // Notify executor when thread started (in executor thread) - connect(thread, SIGNAL(started()), executor, SLOT(start())); // Replies from executor object must go to this object connect(executor, SIGNAL(reply(int,QString)), this, SLOT(message(int,QString))); // Requests from this object must go to executor connect(this, SIGNAL(cmdRequest(QString)), executor, SLOT(request(QString))); + // On stopExecutor signal // - queue executor for deletion (in execution thread) // - quit the Qt event loop in the execution thread |
