From a404b1512a0938091770e1f0de45412f4df12923 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Sat, 25 Jun 2011 22:57:24 +0200
Subject: [PATCH] Improve look/usablity of send coins dialog

---
 doc/assets-attribution.txt      |   3 +-
 src/qt/bitcoin.qrc              |   2 +
 src/qt/bitcoingui.cpp           |   2 +-
 src/qt/forms/sendcoinsdialog.ui | 108 +++++++++++++++++++-------------
 src/qt/res/icons/editcopy.png   | Bin 0 -> 879 bytes
 src/qt/res/icons/editpaste.png  | Bin 0 -> 1458 bytes
 6 files changed, 71 insertions(+), 44 deletions(-)
 create mode 100644 src/qt/res/icons/editcopy.png
 create mode 100644 src/qt/res/icons/editpaste.png

diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt
index 623a5027ca..b3c9c7c7aa 100644
--- a/doc/assets-attribution.txt
+++ b/doc/assets-attribution.txt
@@ -26,7 +26,8 @@ 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
+Icon: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
+      src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png
 Designer: http://www.everaldo.com
 Icon Pack: Crystal SVG
 License: LGPL
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index 3d4a3e163b..663eb4869d 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -19,6 +19,8 @@
         <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>
+        <file alias="editpaste">res/icons/editpaste.png</file>
+        <file alias="editcopy">res/icons/editcopy.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 ed09ac9c3e..1b4e13c420 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -93,7 +93,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     hbox_balance->addSpacing(5);/* Add some spacing between the label and the text */
 
     labelBalance = new QLabel();
-    labelBalance->setFont(QFont("Monospace"));
+    labelBalance->setFont(QFont("Monospace", -1, QFont::Bold));
     labelBalance->setToolTip(tr("Your current balance"));
     hbox_balance->addWidget(labelBalance);
     hbox_balance->addStretch(1);
diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
index 46c71456af..3212424896 100644
--- a/src/qt/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>736</width>
-    <height>149</height>
+    <height>193</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,10 +16,70 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout">
+     <item row="3" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLineEdit" name="payTo">
+         <property name="toolTip">
+          <string>The address to send the payment to  (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
+         </property>
+         <property name="maxLength">
+          <number>34</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="addressBookButton">
+         <property name="toolTip">
+          <string>Look up adress in address book</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="icon">
+          <iconset resource="../bitcoin.qrc">
+           <normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
+         </property>
+         <property name="shortcut">
+          <string>Alt+A</string>
+         </property>
+         <property name="autoDefault">
+          <bool>false</bool>
+         </property>
+         <property name="flat">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pasteButton">
+         <property name="toolTip">
+          <string>Paste address from system clipboard</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="icon">
+          <iconset resource="../bitcoin.qrc">
+           <normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
+         </property>
+         <property name="shortcut">
+          <string>Alt+P</string>
+         </property>
+         <property name="autoDefault">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
      <item row="5" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>&amp;Amount:</string>
+        <string>A&amp;mount:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -42,42 +102,6 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="QLineEdit" name="payTo">
-       <property name="toolTip">
-        <string>The address to send the payment to  (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
-       </property>
-       <property name="maxLength">
-        <number>34</number>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="2">
-      <widget class="QPushButton" name="pasteButton">
-       <property name="toolTip">
-        <string>Paste address from system clipboard</string>
-       </property>
-       <property name="text">
-        <string>&amp;Paste</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="3">
-      <widget class="QPushButton" name="addressBookButton">
-       <property name="toolTip">
-        <string>Look up adress in address book</string>
-       </property>
-       <property name="text">
-        <string>Address &amp;Book...</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="1">
       <widget class="QLabel" name="label_3">
        <property name="font">
@@ -91,7 +115,7 @@
       </widget>
      </item>
      <item row="5" column="1">
-      <widget class="BitcoinAmountField" name="payAmount" native="true"/>
+      <widget class="BitcoinAmountField" name="payAmount"/>
      </item>
      <item row="4" column="1">
       <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -101,7 +125,7 @@
           <string>Add specified destination address to address book</string>
          </property>
          <property name="text">
-          <string>Add to address book as</string>
+          <string>A&amp;dd to address book as</string>
          </property>
         </widget>
        </item>
@@ -187,7 +211,7 @@
  <customwidgets>
   <customwidget>
    <class>BitcoinAmountField</class>
-   <extends>QWidget</extends>
+   <extends>QLineEdit</extends>
    <header>bitcoinamountfield.h</header>
    <container>1</container>
   </customwidget>
@@ -197,8 +221,8 @@
   <tabstop>addToAddressBook</tabstop>
   <tabstop>addAsLabel</tabstop>
   <tabstop>payAmount</tabstop>
-  <tabstop>pasteButton</tabstop>
   <tabstop>addressBookButton</tabstop>
+  <tabstop>pasteButton</tabstop>
   <tabstop>sendButton</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
diff --git a/src/qt/res/icons/editcopy.png b/src/qt/res/icons/editcopy.png
new file mode 100644
index 0000000000000000000000000000000000000000..f882aa2ad8a378c229aecf7c2651a42a2f8d25b8
GIT binary patch
literal 879
zcmV-#1CacQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)CU<25;%fnYk~j(0{lrt
zK~#9!#g|QQ+eQ$EpINRFKs6A@g_VPRDB_&r!a(c(f?nEVukCO1A*c4*zhPKG+j|`J
z;9e7?jnk0andyNvO<JTSS}L-DL}9rf@6Nu@>`L67Pgx?s>x;iesW>}d@Y9b!$flFK
zd-Zkk>eAOO7q2e;&6~gd=U;yHZ3qZ=y-cN&e=K<a{sV8{{=>U>SIztBbb7fB5n)vW
z34xep#4PL7AAfmtu(LCLy{U*n0V0Bk5JW%(X|>$l-C^(ZM||`3S5F`BKKgSL5%ErS
znV`uLAZ8h=iL>(sXXl+}U)0YN;N?~YG?54aO$mVSzxx(b=j!T;5C7%>{Pz1F{4Wvc
zL_>ru6U-pbbIMYy`cUo7>FJBb(eq<wv)L$YSDG+nH$G5xioB#ui4X!0CKD#HTEl$)
zgu`bCJUyIuKG#tj^2tg8nhaGX&r6D;z|1NtVjzow7^@*vo%~}l8rv|G12h?$40ESU
z2~)-0D>6bL#z@RECX>lV*oNNpScl%+DT;!!RLrXV4w;a}Q2h=85vk4U_rf;zxgMY>
z5=Bv<>b21fJRk(j6@n9}1l{gC2HRc=QmLer>J@=`CBn=I!Evi64Nj1(6aKN-_HKcy
zwsOEyh>%vdnnK*A7hCAZc2IyO!|MUsgS9({a1-tuT|NriK@WJJCxR2KGG$Xws3vU*
zakD{eO)8?oE#Yy9f|X}E){UGhX2aNCdnmhw=aK+31NUaN?v5Ls)eoH+eb|Blf?JoA
zUIESOMZkS28fI2MJ6EbE6P9H;3fm<CBErLm-OOfsBgEXRFgHSsSer^!n?$rOwvB))
zSu8fb;WpUnGPaI(u<Zz_kIIvECptZSv6#=F08kbQHDmAbUUM!iM*-ZV*Wm3fSo=0}
z^!%8^X9t)%MOmV%OyUDR+nJ8ScGQKWU1qZx`}_ONnb9U^2;<w>u6-X^Rql)JRs?jg
z?MY&HVY|^5Yy;bk1Z)di0J+ZB_b4ZuPVVk6<x~GX{|}6*Sg|qp#)|*|002ovPDHLk
FV1j4(m!$vz

literal 0
HcmV?d00001

diff --git a/src/qt/res/icons/editpaste.png b/src/qt/res/icons/editpaste.png
new file mode 100644
index 0000000000000000000000000000000000000000..a192060bdd1b432c82cf6a4f09d016856ee95701
GIT binary patch
literal 1458
zcmV;j1x@;iP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%L`g(JRCwBA
z{Qv(y0|+oOGBV%-t*!GGFflR3LwNrgpjyD-@85ryPn_7}wRP+A7eMYG1`+{405O0Z
z@E_SkG*DABeZlnUYyW@${_{UJuzvmi|CN=KubY}Wr~;L<l4?Id05Kwmz|G0p0)PMg
zH~jVIKhvMT{~1@j%7~Sc5{pYp@@3%UWXEa9+O_)_PM*AcQ{(^YN_~lsU)fj~{{hXo
zZ&h{kJ~+rA7%Kn>Ah-k0b!!>2u`=#sX6F{*6jNk)@_~<G_ahUAw6q`w4h}YgK3TD1
z7lY7`V+@uG&lrAve8uql(`$yOZ-3>vx7?lsl>Q0C|FG!;2p|?1<If+)^+MVv0t#N9
zK;CbLUpId;u&rTY`2G7g7!v}#yj%=CvdRn!enw#a+shXjzHQw;DcfD_{M4PV&H{yg
zU<(O=0D?Q<$1etX8G9Xu|9_uC64#$U4Bx)-GJN{<ji|W%`t=6`57$Sa{-0pJkcI@q
zgQG$WJRBc%fZUtVP{42iKmfrV@a^Y+1}2t24F93&n4R@6!<{=%Ksf+s6r!iyxM&Wb
z{$DTyfu3Ms`277JDE>g030pJ(1Q6T--+=)H*9-*m(hLmC=CPBWtKbg!#_$8^sb9Yt
z7@?M9&F26Cgc1VC4xkA9{RfH@hM&LwG5r4XAFon?0740Ye?%lUqQFOBx&fN?<L5t6
z2;c<(0Yr8P{Q4`x@a2~RI34`^2Pw?{1L=Pt{^##tHnWU0gG~^Z&GHjv8*xPeKmg%P
z1BAfmAF>SWf?f>l?CkIa333F;F@Ht>0kic#27Q@-3{02rge+RLnKdrXHxU#$Pz(nE
z0mOs|0f+;L#s7dw9Ar5U4>uU|@^Ulq@$oS5^Yegd2<8UW6%6X?s{ZrlZ3JZ}J|JdB
zb^t&C!5#1e90k9L#{Yoj#Q*<<LkbiUdU{GgN2mnMn6Vzi5dZ-McK|5vaQgPwPlkVA
zzaj9)FARTyLH3^r7ySME9~e@s3`Rz(44RrM0h1=JL2(2?05Kse{s*!Q83Pl>zgHg^
z{ylvQp<(#lCx(CDeiD}>fl&ae=|PS#Fi>WYmX-?W?Og$P1V8|>pcW#CJoEoE(1Opn
zE&0ntTomx~ax!e%bQ~NKAjg1cAt8|fpi~7YGXVq;3${}1|3_e!_=-PA{A2!0R1_E)
zse#kMj~~C`>TlnE2BP?Z_!U3^p*r9<FwTDfefIG?L4*G>6Bh!ktgJu>{AOTbVF71R
zq@)M3n+YI*P#geCZ2w<>Wgy1nzhDOtR`>fiB&0wM9wsJ4p#=i~0fg#+k3h?R6IU4h
z`|}sCJO2RXfByUfwh&=C1KbfX01!Z^QSjj_BtH_9x>-;|0A%Q|Uw?r3FW7RJPeD0=
ziHQ-(a?}6@2q3g5AigL@4gr|O2um@2jO++xhXVu<)?7f81OEPjTMo)vn3gi&bOdq;
z00a<<13rBG%fQd|kGLrK{RbS>kQOy&FynIsvI77Dhy~Gx_<wZMDPC&})z84@7~ypA
zK?LFx<kU^9Baov2Ab{Wwxbo~%_|HE)Q(k`(3?L>1#Pm2A3^067oFkA!03d+i4%mI;
z<x3z=0WvG0<unUE2h>{^0@X4m5=wB`Xygz82q0ujK&k2jwEfP8UQwX~9v;E>AcL@5
zhTjp$Apj6S=)MG{s;^K?por!80W*kHM<6=@Ab^<2ZFhny807u}$TCQDAkz>_(Z!LY
z03d)^$ZmN9tJcexA2U37@CM!%M8=@9;UCbum}38d9iEqPa{vMi0Q+WtY{NEovH$=8
M07*qoM6N<$f=oDrEdT%j

literal 0
HcmV?d00001