From b960fcb86a23b3a30d6a2f70aaf4bc17e00e6736 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Mon, 16 Dec 2013 22:20:22 +0100 Subject: [PATCH] [Qt] update bitcoin-qt.pro and assets-attribution.md - remove unused and unmentioned file notsynced.png (we use an animation for this) - add missing coincontroldialog.ui to bitcoin-qt.pro - also unify formating in assets-attribution.md --- contrib/bitcoin-qt.pro | 25 +++++++++--------- doc/assets-attribution.md | 46 ++++++++++++++++----------------- src/qt/res/icons/notsynced.png | Bin 887 -> 0 bytes 3 files changed, 36 insertions(+), 35 deletions(-) delete mode 100644 src/qt/res/icons/notsynced.png diff --git a/contrib/bitcoin-qt.pro b/contrib/bitcoin-qt.pro index 6e31c2ed..8bfa4a18 100644 --- a/contrib/bitcoin-qt.pro +++ b/contrib/bitcoin-qt.pro @@ -1,19 +1,20 @@ FORMS += \ - ../src/qt/forms/transactiondescdialog.ui \ - ../src/qt/forms/signverifymessagedialog.ui \ - ../src/qt/forms/sendcoinsentry.ui \ - ../src/qt/forms/sendcoinsdialog.ui \ - ../src/qt/forms/rpcconsole.ui \ - ../src/qt/forms/overviewpage.ui \ - ../src/qt/forms/optionsdialog.ui \ - ../src/qt/forms/intro.ui \ - ../src/qt/forms/editaddressdialog.ui \ - ../src/qt/forms/askpassphrasedialog.ui \ - ../src/qt/forms/addressbookpage.ui \ ../src/qt/forms/aboutdialog.ui \ + ../src/qt/forms/addressbookpage.ui \ + ../src/qt/forms/askpassphrasedialog.ui \ + ../src/qt/forms/coincontroldialog.ui \ + ../src/qt/forms/editaddressdialog.ui \ + ../src/qt/forms/intro.ui \ + ../src/qt/forms/openuridialog.ui \ + ../src/qt/forms/optionsdialog.ui \ + ../src/qt/forms/overviewpage.ui \ ../src/qt/forms/receivecoinsdialog.ui \ ../src/qt/forms/receiverequestdialog.ui \ - ../src/qt/forms/openuridialog.ui + ../src/qt/forms/rpcconsole.ui \ + ../src/qt/forms/sendcoinsdialog.ui \ + ../src/qt/forms/sendcoinsentry.ui \ + ../src/qt/forms/signverifymessagedialog.ui \ + ../src/qt/forms/transactiondescdialog.ui \ RESOURCES += \ ../src/qt/bitcoin.qrc diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md index e85e7452..b0954912 100644 --- a/doc/assets-attribution.md +++ b/doc/assets-attribution.md @@ -4,29 +4,29 @@ The following is a list of assets used in the bitcoin source and their proper at ----------------------- #### Info * 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/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 - -[David Vignoni](www.icon-king.com) +[David Vignoni](http://www.icon-king.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/) +* 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 + 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 ----------------------- @@ -38,17 +38,16 @@ schollidesign * 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 + src/qt/res/icons/connect*.png md2k7 ----------------------- ### Info * Designer: md2k7 -* Site: https://bitcointalk.org/index.php?topic=15276.0 -* License: You are free to do with these icons as you wish, including selling, - copying, modifying etc. +* 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 @@ -57,15 +56,15 @@ md2k7 ----------------------- ### Info -* Designer: [http://www.everaldo.com](http://www.everaldo.com) * 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) + 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) ----------------------- @@ -75,16 +74,17 @@ Everaldo (Everaldo Coelho) * 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/update_spinner.mng -[Vignoni David](http://www.oxygen-icons.org/) +[Vignoni David](http://www.oxygen-icons.org) ----------------------- ### Info * 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. +* Site: [http://www.oxygen-icons.org](http://www.oxygen-icons.org) ### Assets Used src/qt/res/icons/debugwindow.png diff --git a/src/qt/res/icons/notsynced.png b/src/qt/res/icons/notsynced.png deleted file mode 100644 index 87b1c3290b1eea65f9e4ac01b3a930b9a75d0491..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 887 zcmV--1Bm>IP)(BS*FA<#CC5*FVJ0vaJ!DTF5Wv1{}ldv`K`L!kh5RC#X0R|I5fD+P> z=<)$3s)Z3mAf7xJ?0GAPTW=!3EV0d6&Un0DCN-Dkd)uEa$$Woj9eqV3CK!Q27?44q zL<0si20{1T8g;0@{c3;K(vt6)^H&ajeS5pNvmln`S3(JRRvbp0ThM-EGhJ= z17TVC-4i5|#nv$}Z*5hCHT3}i8A{9D;cshsHZF46q9+5CV8n}0D_ ze8pf+DFj!+24r#gauQ$PX#@byC_otxX?pVrm!WkJtFjCx+8T5=Vz!PcV&apo7fp*0 zW{ki|!3YSQ-APpxGwGr9+|yq_K6R@s+dZ~o`vqzXqu6(tg}zU|*k%zS2xDDUq-i-p zBZ$H{NBcd($j{Vx14I<{o4@!A&;oIUS10GLY(Jh_{i)p5LhqKi@8RXm-rxa2>ngKG z|KX71TRa)jq;sFk?BT$%G}$4Jq7eh=+2MvLu0?ky8zOy!Ae#L^FA5WH-3dk&zgeDB%FZUl|({>~+fMpd>icL3T_RG{kK} zp@}m{L;Ja;*;bR?i?J&mMl}oQi~u1lkjWXRh?vlJuR%21R;OhZnnMFYkVC(KWiW`& zWDwmmAn@jXL?K$AJ2AsI+}i