add configure and receive icon

diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt
index 820183e..623a502 100644 (file)
--- a/doc/assets-attribution.txt
+++ b/doc/assets-attribution.txt
@@ -6,22 +6,39 @@ Icon: src/qt/res/icons/send.png
 Icon Pack: Vista Style Arrow
 Designer: Icons Land
 License: Freeware Non-commercial
-http://findicons.com/icon/231371/right3green
+Site: http://findicons.com/icon/231371/right3green
 
 Icon: src/qt/res/icons/address-book.png
 Icon Pack: Farm-Fresh Web
 Designer: FatCow Web Hosting
 License: Creative Commons Attribution (by)
-http://findicons.com/icon/163938/book_open
+Site: http://findicons.com/icon/163938/book_open
 
 Icon: src/qt/res/icons/connect*.png
 Icon Pack: Human-O2
 Designer: schollidesign
 License: GNU/GPL
-http://findicons.com/icon/93743/blocks_gnome_netstatus_0
+Site: http://findicons.com/icon/93743/blocks_gnome_netstatus_0
 
 Icon: src/qt/res/icons/transaction*.png
 Designer: md2k7
-https://forum.bitcoin.org/index.php?topic=15276.0
+Site: https://forum.bitcoin.org/index.php?topic=15276.0
 License: You are free to do with these icons as you wish, including selling,
  copying, modifying etc.
+
+Icon: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png
+Designer: http://www.everaldo.com
+Icon Pack: Crystal SVG
+License: LGPL
+
+Icon: src/qt/res/icons/receive.png
+Designer: Oxygen team
+Icon Pack: Oxygen
+License: Creative Common Attribution-ShareAlike 3.0 License or LGPL
+Site: http://www.oxygen-icons.org/
+
+Icon: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
+Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan)
+License: Public Domain
+Site: http://forum.bitcoin.org/?topic=1756.0
+

diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index ec64770..3d4a3e1 100644 (file)
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -17,6 +17,8 @@
         <file alias="transaction_3">res/icons/clock3.png</file>
         <file alias="transaction_4">res/icons/clock4.png</file>
         <file alias="transaction_5">res/icons/clock5.png</file>
+        <file alias="options">res/icons/configure.png</file>
+        <file alias="receiving_addresses">res/icons/receive.png</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="about">res/images/about.png</file>

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 028882f..f487da7 100644 (file)
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -145,7 +145,7 @@ void BitcoinGUI::createActions()
     addressbook->setToolTip(tr("Edit the list of stored addresses and labels"));
     about = new QAction(QIcon(":/icons/bitcoin"), tr("&About"), this);
     about->setToolTip(tr("Show information about Bitcoin"));
-    receivingAddresses = new QAction(QIcon(":/icons/receiving-addresses"), tr("Your &Receiving Addresses..."), this);
+    receivingAddresses = new QAction(QIcon(":/icons/receiving_addresses"), tr("Your &Receiving Addresses..."), this);
     receivingAddresses->setToolTip(tr("Show the list of receiving addresses and edit their labels"));
     options = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
     options->setToolTip(tr("Modify configuration options for bitcoin"));

diff --git a/src/qt/res/icons/configure.png b/src/qt/res/icons/configure.png
new file mode 100644 (file)
index 0000000..95bd319
Binary files /dev/null and b/src/qt/res/icons/configure.png differ

diff --git a/src/qt/res/icons/receive.png b/src/qt/res/icons/receive.png
new file mode 100644 (file)
index 0000000..ea9eac6
Binary files /dev/null and b/src/qt/res/icons/receive.png differ