From 3a7abc2c77febe46e9af1423e19a6354e6eafcb4 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 12 May 2011 17:55:24 +0200 Subject: [PATCH] update --- TODO | 6 ++ aboutdialog.cpp | 15 +++- aboutdialog.h | 13 ++- aboutdialog.ui | 162 +++++++++++++++++++++++++++++++++++++ addressbookdialog.cpp | 20 +++++ addressbookdialog.h | 6 ++ addressbookdialog.ui | 139 ++++++++++++++++++------------- bitcoin.pro | 11 +-- bitcoin.qrc | 3 + bitcoingui.cpp | 2 +- res/icons/address-book.png | Bin 656 -> 1211 bytes res/icons/send.png | Bin 938 -> 1485 bytes res/images/about.png | Bin 0 -> 3488 bytes sendcoinsdialog.cpp | 23 ++++++ sendcoinsdialog.h | 6 ++ sendcoinsdialog.ui | 80 ++++++++---------- 16 files changed, 375 insertions(+), 111 deletions(-) create mode 100644 aboutdialog.ui create mode 100644 res/images/about.png diff --git a/TODO b/TODO index 3d1785cda1..0cc78f1193 100644 --- a/TODO +++ b/TODO @@ -54,3 +54,9 @@ AboutDialog - Toolbar icon - 'notify' on incoming transaction + +- AddressTableModel + - Name / Label + - Address + - Delete / Copy to clipboard based on tab + diff --git a/aboutdialog.cpp b/aboutdialog.cpp index 90d74e69a4..3d7a3f98af 100644 --- a/aboutdialog.cpp +++ b/aboutdialog.cpp @@ -1,6 +1,19 @@ #include "aboutdialog.h" +#include "ui_aboutdialog.h" AboutDialog::AboutDialog(QWidget *parent) : - QDialog(parent) + QDialog(parent), + ui(new Ui::AboutDialog) { + ui->setupUi(this); +} + +AboutDialog::~AboutDialog() +{ + delete ui; +} + +void AboutDialog::on_buttonBox_accepted() +{ + close(); } diff --git a/aboutdialog.h b/aboutdialog.h index 1372121099..827cc741c3 100644 --- a/aboutdialog.h +++ b/aboutdialog.h @@ -3,16 +3,23 @@ #include +namespace Ui { + class AboutDialog; +} + class AboutDialog : public QDialog { Q_OBJECT + public: explicit AboutDialog(QWidget *parent = 0); + ~AboutDialog(); -signals: - -public slots: +private: + Ui::AboutDialog *ui; +private slots: + void on_buttonBox_accepted(); }; #endif // ABOUTDIALOG_H diff --git a/aboutdialog.ui b/aboutdialog.ui new file mode 100644 index 0000000000..2cc178fb98 --- /dev/null +++ b/aboutdialog.ui @@ -0,0 +1,162 @@ + + + AboutDialog + + + + 0 + 0 + 593 + 319 + + + + About Bitcoin + + + + + + + 0 + 0 + + + + + + + :/images/about + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + <b>Bitcoin</b> version + + + + + + + 0.3.666-beta + + + Qt::RichText + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Copyright (c) 2009-2011 Bitcoin Developers + +This is experimental software. + +Distributed under the MIT/X11 software license, see the accompanying file license.txt or http://www.opensource.org/licenses/mit-license.php. + +This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard. + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + + + + + + + + + + + buttonBox + accepted() + AboutDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + AboutDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/addressbookdialog.cpp b/addressbookdialog.cpp index ca74159d2f..e1ce1feefc 100644 --- a/addressbookdialog.cpp +++ b/addressbookdialog.cpp @@ -14,6 +14,26 @@ AddressBookDialog::~AddressBookDialog() } void AddressBookDialog::setTab(int tab) +{ + ui->tabWidget->setCurrentIndex(tab); +} + +void AddressBookDialog::on_OKButton_clicked() +{ + accept(); +} + +void AddressBookDialog::on_copyToClipboard_clicked() +{ + +} + +void AddressBookDialog::on_editButton_clicked() +{ + +} + +void AddressBookDialog::on_newAddressButton_clicked() { } diff --git a/addressbookdialog.h b/addressbookdialog.h index a51c02a794..e287019d9b 100644 --- a/addressbookdialog.h +++ b/addressbookdialog.h @@ -23,6 +23,12 @@ public: void setTab(int tab); private: Ui::AddressBookDialog *ui; + +private slots: + void on_newAddressButton_clicked(); + void on_editButton_clicked(); + void on_copyToClipboard_clicked(); + void on_OKButton_clicked(); }; #endif // ADDRESSBOOKDIALOG_H diff --git a/addressbookdialog.ui b/addressbookdialog.ui index e646b08ef2..530322ee00 100644 --- a/addressbookdialog.ui +++ b/addressbookdialog.ui @@ -6,72 +6,101 @@ 0 0 - 400 - 300 + 591 + 347 - Dialog + Address Book - - - Qt::Vertical + + + 1 - - - 20 - 40 - - - + + + Sending + + + + + + + + + + Receiving + + + + + + These are your Bitcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. The highlighted address is displayed in the main window. + + + Qt::AutoText + + + true + + + + + + + + + - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Copy to Clipboard + + + + + + + Edit... + + + + + + + New Address... + + + + + + + OK + + + + - - - buttonBox - accepted() - AddressBookDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - AddressBookDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - + diff --git a/bitcoin.pro b/bitcoin.pro index 4e9bfda32e..7bcf3afded 100644 --- a/bitcoin.pro +++ b/bitcoin.pro @@ -10,24 +10,25 @@ INCLUDEPATH += . # Input HEADERS += bitcoingui.h \ transactiontablemodel.h \ - aboutdialog.h \ addresstablemodel.h \ optionsdialog.h \ mainoptionspage.h \ sendcoinsdialog.h \ - addressbookdialog.h + addressbookdialog.h \ + aboutdialog.h SOURCES += bitcoin.cpp bitcoingui.cpp \ transactiontablemodel.cpp \ - aboutdialog.cpp \ addresstablemodel.cpp \ optionsdialog.cpp \ mainoptionspage.cpp \ sendcoinsdialog.cpp \ - addressbookdialog.cpp + addressbookdialog.cpp \ + aboutdialog.cpp RESOURCES += \ bitcoin.qrc FORMS += \ sendcoinsdialog.ui \ - addressbookdialog.ui + addressbookdialog.ui \ + aboutdialog.ui diff --git a/bitcoin.qrc b/bitcoin.qrc index ebce276c8d..0d91bbcd40 100644 --- a/bitcoin.qrc +++ b/bitcoin.qrc @@ -5,4 +5,7 @@ res/icons/quit.png res/icons/send.png + + res/images/about.png + diff --git a/bitcoingui.cpp b/bitcoingui.cpp index 4083afbf8b..c78bb3c5ac 100644 --- a/bitcoingui.cpp +++ b/bitcoingui.cpp @@ -41,7 +41,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): QAction *quit = new QAction(QIcon(":/icons/quit"), tr("&Quit"), this); QAction *sendcoins = new QAction(QIcon(":/icons/send"), tr("&Send coins"), this); - QAction *addressbook = new QAction(QIcon(":/icons/address-book"), tr("&Address book"), this); + QAction *addressbook = new QAction(QIcon(":/icons/address-book"), tr("&Address Book"), this); QAction *about = new QAction(QIcon(":/icons/bitcoin"), tr("&About"), this); QAction *receiving_addresses = new QAction(QIcon(":/icons/receiving-addresses"), tr("Your &Receiving Addresses..."), this); QAction *options = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); diff --git a/res/icons/address-book.png b/res/icons/address-book.png index 621ca40245be8863d582ae83d25bffb95b476fc6..abfb3c3a5107343044db140ad70c3eccfa87fe9e 100644 GIT binary patch literal 1211 zcmV;s1VsCZP)5a821AU-MO{GT zp$WC>LJ&}6L`ZB1-~(YH3dWLKA{!7TF$lfAm)p5B^BotRLK{#QrYAX>Oujki|DE&u za=uX_!epAB)a-!$uMeU)Mw~-LaNHjYv0)itBLxM0QsDwP*^&-xRe*c3V&i8yg z&th!~V+=~Ee-uz6LVJ6A*Tst$H|KJ>HsAM2r_*>|N@X&c>wo-y{m&~`uat_#;wOM) zbGc_~YicqzkJJzZ0YNb0%0Ykvf*>G@B9>3TDHl>L+fJW8eafz0+2Ms@xZ~QjYt`d{ z$FX3PG>lX#4Ta$XC%-<`Zbk9rQ%lHZAHef1;=q`R81>o~n7f!IXA3U_r>qmFfRcz* zYpsD%5v@ndwl2llGvCv(q62F*UmQKc$`u`0W5C?g5Kw?pXss*vFc1-)!kvybW1tALm8cZxJkO-&$zIEa;CwPOAH z4J=){oIr?4*G3*+w20!ZVFm_%#sN<(Tu3YmlRzDd?_K;Z51qf8aw230gM)*(Fs7nnDy0!x z+aBf6{*O8H?Kfy`cxTT}Hgs?1hjZtclFMQ}i)Rg>X-O)md3`wtUp>hD`SW*95O4|_ z8X9oo5T`%{Z8cq+x>&P%9fjaF{a+qMfCUR4LjdKHQu0_HTfaI$uQs;OyKz~GiG zTW(AcFa~DV&&D}N>>MHval)#O4z_K3g|HIS^VXY0QABG?8^$P%(rBfSB>oOgttT=N z5e$${`xEM{gb~O4``NzzHBu?di4(_Jwrn{m`|pEzYyesp#iF%NDWxcv%gO54LxVVG z&YH#Ey?cn`n00Gc6NND@j&VrR_`5S~>+X4kVVN)t4S@1}-{x|;eK&60n3v6F-Lz@b zm^yVT)z#HxtFp>Z`;xzyS66?#`j^s_5cP0VQ)8;WpYc*Dvk1$vA*x6#M)F;x?Qwk z7=~dOjl?c0Rf4b_1VIU)TrQW3#Zq~2FdrU1bSQ%4J^&s}czB6t0Ds(jDruZ%^garK z2$70FMZpLVD5WYulz0pj#z@6utdqqc5j06sod~D|kpl#!oEnXd$0Z%_cPf}PoAkem ZzX3Nh0V!cC;+p^f002ovPDHLkV1mI9FyH_H literal 656 zcmV;B0&o3^P)1RCwBylTT<9K@`T{Y&Y9vP11%& zstq<(Db$ckda58rp+vlhhqhNQA|CWm^lB;Cn}RtBr6=(sf*w2xrjbGqtx69|C4wlL zLsE+kyKHTm?9A@?X1Xi>iO@dy_RY?I{N}ygw`6K|_7VUbMNw1(WuvN`^RNCoP6!#m zoDyrXcdfDTl5>Cy_iLcKuG{x~Zf<^YZ4J(3GF#tmd#hZjd|oz;<&Tw0aj?HXKbFgl zWzy-B$#^{Zwp>o~rwauH-9kx#$bct8r=}%)&@`IK3=JJWaqf2EfpvXy>Q1*FiG~yf z!m28LuE%rWhvG6u0zeRAtq_RboS2vosU6Y3pSdoFRWIuUTz6w;I{)x@QxJ@?fA)lL zm1oOuVED2Gj5x-Nk(QD5Ja1nB;k#QX-oR%m2{_#}fHF?nRX{0iTY-dADqB|>^L~-{ z0|YyaTl`IX*7nqk9$5gI6HojI&*HYCYRSY7GYVwgWrc6uvYW qw?#Vy{vX{a-T%d{b_N0XDZl{2Ogn_%%oR8Q0000mz$e+&*A z9&fy@cK`qdO-V#SR7l5-mRqP@M;*q0|Cw29?RDAv?6Y@rYI2N8)21rcCdKy2;ssxn z6rTj4l_;o4DB=wv5JjyLp;UxE_@ECWieM`!f)7$Et)^xA9>g$cc$HGYrEF^Z!2Pe?K$dH?nwip0!g0y!U8KXpvADJyrsM0)%U&nsss? zgi!-qS^i%!*NrStZX4G(53(6MDyQmU1rZRDTO_E#PA%Z z)ZW_{e{t$>%bzojMzqX!drJg0)CsgduNnNR0(Top1t@HAcgS=){cJoxe=WGc7o`D8 zgWQDV#wiQrmU?1oJtQy&GN1r*AS2Tq%Y$D%%%Kn5`32d<6E*=`fGxpR*SDJ!*cqTr zp?O5E5!675ty7_-J!sHaeG+li?wi!CixS!0!*1n<#4X_$Sz~pfOBX;FOdk+rxQgIs= zm+er3X!;=0$nYjb}1zR^2k;`s?#I6+04F!FIDmomy3Mw^_U zJICw%lcYZ;9w#J8e?l@zNRyP!K}wYs?5q|(7B9qAwZdOa(Zk|UJGiB1{KBgnjtVuC zC}Sm9=1nf*;!si$GiF?mNk?8IvqQCosM`CGYik|ABqq|JO%Xr>2$r zv{jd#dN+I2K6cA)=53c|9^n(99Rp&isK~3FET1qcMr_Ike?8UXin@dqp`Z7uhBbB! z(@9CQ(ZXmE(-;IILnF0kb)8y+2TChE-5^j+8sedip_YoNO6eoSMU2i}bfJ+-qe?}X zg^V}Hm;^fSY;orD+3yTa){mKYH{a{*Ti81nM$uxou|vADK&xsKW=*`(L$pFHC=7z3 zD_wj)q(6L>f4YDwuQ92MI|zuzQ~YiN9hmQ}{dxGP_P{LP{(An#`Wr7T%r$=$mC;E( z*1OBFbmKH;G#=8wIwD;IyGmWIviYg|4<9`K$PXS^GN-X6IGKw(^l2p>a<4!|>coZT zdf(N)APS7B4WKW&co#is{NCVDs~V*>%27yQn6{@#e=5B7Ow4aj|8d8eYU%3HhrU8@ z(!(7#n2YCG9h{@l@*Y3??AmeH6GYFX+=x{utC&@d7L5|YCk~@3ag7y`T(VRK52AwV0R=8SR z^w6VKe|GrY(vt-3;3vx`&wt%S4qB`0T+rME8)XFJC|t+zkNe+*F5qpctU^fz0Zo4W z%Fk)eM?YOUdF~NE3{YC#;BMwdaD@s52^^lj^W_=%mac3Wj=!VT<%wrc&}{j?TzdZB zUkXDPtreo=Z5&NNsaaaQoeodk^;g{e4kplucbNs+%95F>)yk<*9Yc5njKKScQ$p;00000NkvXXu0mjf<)yAK delta 890 zcmV-=1BLv}3#tbpiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZy}e+Lv1 z8dQ!TLjV8+DoI2^R5;6ZlS^z=WdKIcea+l?b!N)YX_;bcgN<5KA=HWw41xh;v<|{sq zNrE!WSAR{Avn=wN0!Bc@e?(rK*Fq!48|7P#p|wnt4N5yh;T`n2?&Tg=AGb``VKI^{U&dIe2j)A z@D8ZGI#r}Iqkvm-`s^oIk65UNilRws%_bpF8~X;HLsxaOg$!rDf1X6S22M~x_9JyP z7IjTQvn1n_6O8{b0UkhwaLCW+hsM!Won&s27fOn0i8;v^`qV>I_JWDu359#?6)0> z764p;Td+`?BR^;Hf7-;W+$bjTMWI!Iw)<7|PW{*V_1e$3k95NQg1fltstwU^Uo1MK`-<>|*xOC^rv6J4z{!QwKR=P^dR0wVg;`93u!l9I3 zqr6hatEoh~1GaU;KDctUdit)IqH%LH*zbx5x;+m?H^yiWP)2ZsL(WQ(TTM~_$4OW- z^>@<8>(l>PBS7eg>h-jndxKs6r-R|ZW+{a%TIGdesytn{8dHUnqPc$mFN0oldve>! QcK`qY07*qoM6N<$f&@9O{{R30 diff --git a/res/images/about.png b/res/images/about.png new file mode 100644 index 0000000000000000000000000000000000000000..c9ab9511efb6da23110dea9a1630c8d59336242a GIT binary patch literal 3488 zcmai13se(l7EYx{j|IghdybX*Xcq`oWJAJB3CQaD2mwMDFd~bfktFhz6&xOhr0%Yd zu|{M8NyLHUZUYSjFe1xCL#&(S8A2%_2_djmn;6JLoLxpV$A_s;*{ z@4Mf<1Ab09wC)3k4^Sx7xlWTlZ!Ap;8Gmk9;Bd=}3*Ks~CiY z!b@AphO1mUJI7&5h{(<%^qnItixVLjYStLBWi724Cb?gqeSj17@qkCHY!t{akPN}W zPE^*RzgZ72^Ldkt*NZ}Oy!Qy3i0>cEd9hb}dn?1Lp>K?DzCR~%Ux!+Wq*^Ut z3J$KSHmUNJ`l*%{t7`GH#pL8Fb%?>B#QV&IF1m4aM6?&`9Uy)r`J018HD%)QUf$EX zQV=?4+MVMouDv(;G=0_L;BEttmr!?YYluNqMITOX z;4D6-YO@G4ePQ*FvL$i~5<#ZT9KApmQRx*>s*Lx>9U~id;y6=>Y302~BT0r?iMyV& ztU8y;S6JbhxtAAgK_Q>ty(h@vS$yc46L9b#gNY%|3=_Qym8zj&(X%*q@dQFXWU{#l zPll&fPsW8T=&$Dj-XH=kZ06wWxX(IWE9D;5ew^kAGdmZTs~5mbyH6K*#G>0 zwfhaB-qJO!@NTmeX16de595L+s?{SoMX+obr_e;>^ovw&7TQ%1XRY`Z0<5Ac<6t4r zH~sn3TnsTNh+n_fG&nWc3qoA($3AFcVj|y?0#UT}jY#|m4vuS{=r>DeX*A}H$z~0q zJ53)(EAQczh8n&y6$#=@LZrTOcB0sF>(&;(=upHl0!_CCo8|}Kro-s`3HEp~xm#je8i)Gq>BA8YY6MHn! za4+gewG+_N>S2!Byd@+jW9P&lBCjBU(#U?*iNl1${N$7>cc=clEl)-%PkWUOAIC4- zQ|y7yi)@!T_8@8TP-B_}pp8B}pYMVpIyzdW>DGqIBN$g#SDzFo0PCXD!U<>4oRM-{ zS;_3imU(+G$#`EvXD0|5jpd~jL%MHbA_#F@5X!~Q-mEF+&5zXpM6ri|&TJ};sZ-o; z3&ppjxuXrX`q%kHm(+)v8m_fhBkfzSGA6tAn%<7h!5q)#{)ObhvT)&^Bja z+StjGCeeRTpT-a`t*67v)4Y*d!vqLO+4#qexvsB!p3h*2U&0p%>GdaD(ZtS9zO+(9 z5j|tus^J!ckPdNs;X2f8LXn^VQ{B}K}V8+lpSYr z29rjwmnpved~|hxT_RWrf{l$b%4q!^BqhFjEvBh}7Zv4u&Rbl2E<>xi=<3S1L~{>n zhliy3E6$Nt8^%MW6olH=!~Z>4(@Jvf*XMlf%o)0 0 736 - 129 + 140 - Dialog + Send Coins @@ -56,14 +56,14 @@ - + &Paste - + Address &Book... @@ -97,50 +97,38 @@ - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + &Send + + + + + + + Cancel + + + + - - - buttonBox - accepted() - SendCoinsDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - SendCoinsDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - +