Qt: new icons

- flat and b/w icons seems to be the new trend
- support for HiDPI/retina
- change icon sizes
- fix assets-attribution.md
- removed unused icons

doc/assets-attribution.md

@@ -6,98 +6,51 @@ The following is a list of assets used in the bitcoin source and their proper at
 * License: MIT
 
 ### Assets Used
-	src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
-	src/qt/res/src/clock_green.svg, src/qt/res/src/clock1.svg,
-	src/qt/res/src/clock2.svg, src/qt/res/src/clock3.svg,
-	src/qt/res/src/clock4.svg, src/qt/res/src/clock5.svg,
-	src/qt/res/src/inout.svg, src/qt/res/src/questionmark.svg
+	src/qt/res/icons/watch*.png, src/qt/res/icons/tx_in.png,
+    src/qt/res/icons/tx_inout.png,
 
-[David Vignoni](http://www.icon-king.com)
+[Typicons/Stephen Hutchings](http://typicons.com)
 -----------------------
 
 ### Info
-* Icon Pack: NUVOLA ICON THEME for KDE 3.x
-* Designer: David Vignoni (david@icon-king.com)
-* License: LGPL
-* Site: [http://www.icon-king.com/projects/nuvola](http://www.icon-king.com/projects/nuvola)
-
-### Assets Used
-	src/qt/res/icons/address-book.png, src/qt/res/icons/export.png,
-	src/qt/res/icons/history.png, src/qt/res/icons/key.png,
-	src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png,
-	src/qt/res/icons/receive.png, src/qt/res/icons/send.png,
-	src/qt/res/icons/synced.png, src/qt/res/icons/filesave.png
-
-schollidesign
------------------------
-
-### Info
-* Icon Pack: Human-O2
-* Designer: schollidesign
-* License: GNU/GPL
-* Site: [http://findicons.com/icon/93743/blocks_gnome_netstatus_0](http://findicons.com/icon/93743/blocks_gnome_netstatus_0)
-
-### Assets Used
-	src/qt/res/icons/connect*.png
-
-md2k7
------------------------
-
-### Info
-* Designer: md2k7
-* License: You are free to do with these icons as you wish, including selling, copying, modifying etc.
-* License: MIT
-* Site: [https://bitcointalk.org/index.php?topic=15276.0](https://bitcointalk.org/index.php?topic=15276.0)
-
-### Assets Used
-	src/qt/res/icons/transaction*.png
-
-[Everaldo.com](http://www.everaldo.com)
------------------------
-
-### Info
-* Icon Pack: Crystal SVG
-* Designer: [http://www.everaldo.com](http://www.everaldo.com)
-* License: LGPL
-
-### Assets Used
-	src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
-	src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
-	src/qt/res/icons/add.png, src/qt/res/icons/edit.png,
-	src/qt/res/icons/remove.png (edited)
-
-Everaldo (Everaldo Coelho)
------------------------
-
-### Info
-* Icon Pack: Kids
-* Designer: Everaldo (Everaldo Coelho)
-* License: GNU/GPL 
-* Site: [http://findicons.com/icon/17102/reload?id=17102](http://findicons.com/icon/17102/reload?id=17102)
-
-### Assets Used
-	scripts/img/reload.xcf (modified), src/qt/res/movies/*.png
-
-[Vignoni David](http://techbase.kde.org/Projects/Oxygen)
------------------------
-
-### Info
-* Designer: Vignoni David
-* 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.
-* Site: [http://techbase.kde.org/Projects/Oxygen](http://techbase.kde.org/Projects/Oxygen)
-
-### Assets Used
-	src/qt/res/icons/debugwindow.png
+* Icon Pack: Typicons (http://typicons.com)
+* Designer: Stephen Hutchings (and more)
+* License: CC BY-SA
+* 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_input.png,
 
 Jonas Schnelli
 -----------------------
 
 ### Info
-* Designer: Jonas Schnelli (based on the original bitcoin logo from Bitboy)
+* Designer: Jonas Schnelli
+* Bitcoin Icon: (based on the original bitcoin logo from Bitboy)
+* Some icons are based on Stephan Hutchings Typicons
 * License: MIT
 
 ### Assets Used
-	src/qt/res/icons/bitcoin.icns, src/qt/res/src/bitcoin.svg,
-	src/qt/res/src/bitcoin.ico, src/qt/res/src/bitcoin.png,
-	src/qt/res/src/bitcoin_testnet.png, docs/bitcoin_logo_doxygen.png,
-	src/qt/res/images/splash.png, src/qt/res/images/splash_testnet.png
+    src/qt/res/icons/about.png, src/qt/res/icons/about_qt.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/verify.png,
+    src/qt/res/icons/eye_plus.png, src/qt/res/icons/tx_inout.png,
+    src/qt/res/icons/tx_output.png, src/qt/res/icons/bitcoin.icns,
+    src/qt/res/src/bitcoin.svg, src/qt/res/src/bitcoin.ico,
+    src/qt/res/src/bitcoin.png, src/qt/res/src/bitcoin_testnet.png,
+    docs/bitcoin_logo_doxygen.png, src/qt/res/images/splash.png,
+    src/qt/res/images/splash_testnet.png, src/qt/res/src/tx*.svg,
+    src/qt/res/src/connect*.svg, src/qt/res/src/clock*.svg,
+    src/qt/res/src/mine.svg, src/qt/res/src/qt.svg,
+    src/qt/res/src/verify.svg,

src/Makefile.qt.include

@@ -212,6 +212,8 @@ BITCOIN_QT_H = \
 RES_ICONS = \
   qt/res/icons/add.png \
   qt/res/icons/address-book.png \
+  qt/res/icons/about.png \
+  qt/res/icons/about_qt.png \
   qt/res/icons/bitcoin.ico \
   qt/res/icons/bitcoin.png \
   qt/res/icons/bitcoin_testnet.ico \
@@ -222,11 +224,11 @@ RES_ICONS = \
   qt/res/icons/clock4.png \
   qt/res/icons/clock5.png \
   qt/res/icons/configure.png \
-  qt/res/icons/connect0_16.png \
-  qt/res/icons/connect1_16.png \
-  qt/res/icons/connect2_16.png \
-  qt/res/icons/connect3_16.png \
-  qt/res/icons/connect4_16.png \
+  qt/res/icons/connect0.png \
+  qt/res/icons/connect1.png \
+  qt/res/icons/connect2.png \
+  qt/res/icons/connect3.png \
+  qt/res/icons/connect4.png \
   qt/res/icons/debugwindow.png \
   qt/res/icons/edit.png \
   qt/res/icons/editcopy.png \
@@ -237,11 +239,12 @@ RES_ICONS = \
   qt/res/icons/eye_plus.png \
   qt/res/icons/filesave.png \
   qt/res/icons/history.png \
+  qt/res/icons/info.png \
   qt/res/icons/key.png \
   qt/res/icons/lock_closed.png \
   qt/res/icons/lock_open.png \
+  qt/res/icons/open.png \
   qt/res/icons/overview.png \
-  qt/res/icons/qrcode.png \
   qt/res/icons/quit.png \
   qt/res/icons/receive.png \
   qt/res/icons/remove.png \
@@ -256,7 +259,8 @@ RES_ICONS = \
   qt/res/icons/tx_mined.png \
   qt/res/icons/unit_btc.png \
   qt/res/icons/unit_mbtc.png \
-  qt/res/icons/unit_ubtc.png
+  qt/res/icons/unit_ubtc.png \
+  qt/res/icons/verify.png
 
 BITCOIN_QT_CPP = \
   qt/bitcoinaddressvalidator.cpp \

src/qt/bitcoin.qrc

@@ -4,11 +4,11 @@
         <file alias="address-book">res/icons/address-book.png</file>
         <file alias="quit">res/icons/quit.png</file>
         <file alias="send">res/icons/send.png</file>
-        <file alias="connect_0">res/icons/connect0_16.png</file>
-        <file alias="connect_1">res/icons/connect1_16.png</file>
-        <file alias="connect_2">res/icons/connect2_16.png</file>
-        <file alias="connect_3">res/icons/connect3_16.png</file>
-        <file alias="connect_4">res/icons/connect4_16.png</file>
+        <file alias="connect_0">res/icons/connect0.png</file>
+        <file alias="connect_1">res/icons/connect1.png</file>
+        <file alias="connect_2">res/icons/connect2.png</file>
+        <file alias="connect_3">res/icons/connect3.png</file>
+        <file alias="connect_4">res/icons/connect4.png</file>
         <file alias="transaction_0">res/icons/transaction0.png</file>
         <file alias="transaction_confirmed">res/icons/transaction2.png</file>
         <file alias="transaction_conflicted">res/icons/transaction_conflicted.png</file>
@@ -43,8 +43,12 @@
         <file alias="lock_open">res/icons/lock_open.png</file>
         <file alias="key">res/icons/key.png</file>
         <file alias="filesave">res/icons/filesave.png</file>
-        <file alias="qrcode">res/icons/qrcode.png</file>
         <file alias="debugwindow">res/icons/debugwindow.png</file>
+        <file alias="open">res/icons/open.png</file>
+        <file alias="info">res/icons/info.png</file>
+        <file alias="about">res/icons/about.png</file>
+        <file alias="about_qt">res/icons/about_qt.png</file>
+        <file alias="verify">res/icons/verify.png</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="about">res/images/about.png</file>
@@ -87,5 +91,6 @@
         <file alias="spinner-032">res/movies/spinner-032.png</file>
         <file alias="spinner-033">res/movies/spinner-033.png</file>
         <file alias="spinner-034">res/movies/spinner-034.png</file>
+        <file alias="spinner-035">res/movies/spinner-035.png</file>
     </qresource>
 </RCC>

src/qt/bitcoingui.cpp

@@ -285,20 +285,16 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle)
     quitAction->setStatusTip(tr("Quit application"));
     quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
     quitAction->setMenuRole(QAction::QuitRole);
-    aboutAction = new QAction(networkStyle->getAppIcon(), tr("&About Bitcoin Core"), this);
+    aboutAction = new QAction(QIcon(":/icons/about"), tr("&About Bitcoin Core"), this);
     aboutAction->setStatusTip(tr("Show information about Bitcoin Core"));
     aboutAction->setMenuRole(QAction::AboutRole);
-#if QT_VERSION < 0x050000
-    aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this);
-#else
-    aboutQtAction = new QAction(QIcon(":/qt-project.org/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this);
-#endif
+    aboutQtAction = new QAction(QIcon(":/icons/about_qt"), tr("About &Qt"), this);
     aboutQtAction->setStatusTip(tr("Show information about Qt"));
     aboutQtAction->setMenuRole(QAction::AboutQtRole);
     optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
     optionsAction->setStatusTip(tr("Modify configuration options for Bitcoin"));
     optionsAction->setMenuRole(QAction::PreferencesRole);
-    toggleHideAction = new QAction(networkStyle->getAppIcon(), tr("&Show / Hide"), this);
+    toggleHideAction = new QAction(QIcon(":/icons/about"), tr("&Show / Hide"), this);
     toggleHideAction->setStatusTip(tr("Show or hide the main Window"));
 
     encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this);
@@ -310,7 +306,7 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle)
     changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption"));
     signMessageAction = new QAction(QIcon(":/icons/edit"), tr("Sign &message..."), this);
     signMessageAction->setStatusTip(tr("Sign messages with your Bitcoin addresses to prove you own them"));
-    verifyMessageAction = new QAction(QIcon(":/icons/transaction_0"), tr("&Verify message..."), this);
+    verifyMessageAction = new QAction(QIcon(":/icons/verify"), tr("&Verify message..."), this);
     verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Bitcoin addresses"));
 
     openRPCConsoleAction = new QAction(QIcon(":/icons/debugwindow"), tr("&Debug window"), this);
@@ -321,10 +317,10 @@ void BitcoinGUI::createActions(const NetworkStyle *networkStyle)
     usedReceivingAddressesAction = new QAction(QIcon(":/icons/address-book"), tr("&Receiving addresses..."), this);
     usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels"));
 
-    openAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_FileIcon), tr("Open &URI..."), this);
+    openAction = new QAction(QIcon(":/icons/open"), tr("Open &URI..."), this);
     openAction->setStatusTip(tr("Open a bitcoin: URI or payment request"));
 
-    showHelpMessageAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&Command-line options"), this);
+    showHelpMessageAction = new QAction(QIcon(":/icons/info"), tr("&Command-line options"), this);
     showHelpMessageAction->setStatusTip(tr("Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options"));
 
     connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));

src/qt/forms/sendcoinsentry.ui

@@ -67,6 +67,12 @@
          <iconset resource="../bitcoin.qrc">
           <normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
         </property>
+        <property name="iconSize">
+         <size>
+          <width>22</width>
+          <height>22</height>
+         </size>
+        </property>
         <property name="shortcut">
          <string>Alt+A</string>
         </property>
@@ -84,6 +90,12 @@
          <iconset resource="../bitcoin.qrc">
           <normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
         </property>
+        <property name="iconSize">
+         <size>
+          <width>22</width>
+          <height>22</height>
+         </size>
+        </property>
         <property name="shortcut">
          <string>Alt+P</string>
         </property>
@@ -101,6 +113,12 @@
          <iconset resource="../bitcoin.qrc">
           <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
         </property>
+        <property name="iconSize">
+         <size>
+          <width>22</width>
+          <height>22</height>
+         </size>
+        </property>
        </widget>
       </item>
      </layout>

src/qt/res/movies/makespinner.sh

@@ -0,0 +1,6 @@
+for i in {1..35}
+do
+    value=$(printf "%03d" $i)
+    angle=$(($i * 10))
+    convert spinner-000.png -background "rgba(0,0,0,0.0)" -distort SRT $angle spinner-$value.png
+done