From 05dc59a5c9c7a60dc645fe7da0117c829b2e51dc Mon Sep 17 00:00:00 2001
From: Amir Taaki <genjix@riseup.net>
Date: Mon, 30 Jul 2012 20:34:59 -0300
Subject: [PATCH] Replaced left buttons with a menubar.

---
 data/icons/accounts.png | Bin 921 -> 0 bytes
 data/icons/expand.png   | Bin 657 -> 0 bytes
 data/icons/interact.png | Bin 968 -> 0 bytes
 lib/gui_lite.py         |  62 +++++++++++++++++++++-------------------
 4 files changed, 32 insertions(+), 30 deletions(-)
 delete mode 100644 data/icons/accounts.png
 delete mode 100644 data/icons/expand.png
 delete mode 100644 data/icons/interact.png

diff --git a/data/icons/accounts.png b/data/icons/accounts.png
deleted file mode 100644
index b932d91946715587e19ad57e1c4d760bd77d3fad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000D?000D?0em!Tp#T5?8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10~Sd{K~y-6eUnRQTy+%2fB$>$+_^Jzn@naViOEzZC2^8q66_<1
z9TK4~DvD4=6cj|MA|kH3l62)#6m?TK>Z-Mig5sl!p`-*gO>2FmnkY6glj)e}yfVq1
z_nrH9)0Ak$4?Z|&@g2^``HqlMvKzsJ>gYf$`f@g%TU@xdex|S_*Z3c3yPN$Fxn6(q
z)HA0$5A>?O29xpMK6y0|Q;%h@)MvtB;e9mfdU`fl`(kQAZtQ53ok9rV>gaBN)(q`a
zYo0PCW1FEv{r-DKIQi6J(RFcbWd6*XV;`J*_qqAgPl|{43@|$w$@^9g<n=UpBaN!9
zqKlvCYnMZhAL9AGuDjZ$yFxhH+HhppeR7WlYl+E1uKx3P)|Us5lv?pA+q4-4NQW*L
zYpKop<^+yEL7f%KMkTjr11Y5}CYi9)wY;e&Xx6rwyBtYg9hYZ6{*j4Kzt8=#ymq~I
z>4)X`^=o{4$NJ6{f``TN!AE+}87{BiO8vR4tIgiV&S1;T<S$p=yDuCViN$*6;;CwH
zB%mkfXI9_;eD;YqzLwJ(KvTasI(VY{{OHhw!6ttQkH^<hv@JFZ8T_F@?8B*9M$It&
z_YdpRN)n0E_Q1f}YrqKwzzl1T_1)VaR80lV)Nq>yE>lC>r_vB=B-`cY*TfP|J&B`P
zNLPin7T=%{Lel_R!hxfh65FU!(k&dVhOLybsp2>`{zxO={Qec);Rv#pgTe+iSyll>
z5kiQHrx5+CzR0$|iPW;V#0G|%!K>vdyHaHJ4dQHJyKYeT-NI=sb7P%JDP>iYQp(O(
z)WjmQttD%Y3NBi714Y<u*(I#1L(#3UnvplJ#xb@m7LswM&tBx6m)^RagK~yRuTKo^
z_tXg+HJaT8bOBZ!bfJ(*%FLx{@xq0-<xRi=3R23_ogA!OaK;Mb^^g2zS-#t&5YQtu
z=uw*8tvGS#R(e97%1t{{KpMyb<$vTr2mzq?40Eh!py_xZ5NxXyg}uI-PfUK6I&arx
v0w~FUzwYiJ2_Y0f-$fOu-ev``|3lB;F4<XE5^Hm800000NkvXXu0mjf4b{2b

diff --git a/data/icons/expand.png b/data/icons/expand.png
deleted file mode 100644
index 379e7451040ff28d707183f031ce0d77514167bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000D?000D?0em!Tp#T5?8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10uD(;K~y-6jgr4>R6!JlzccT>-F=&o#2-ye8WSuG64F?x2!dEC
z+G$}Qg8mu7#=<gML=go+tSr)rM6gf`QBnj%q80`*X3ZwqY<AzgxfbssDMFHgVPJ;y
zow?^;nHl@7c;dn(^&U!g-bup#{Cpqps|M;rqeEw|-nidC&|k|9d@#22!2ImJ%kCh6
z^|^<SKg_+jwb^QUoRD+KIh@3S0FrcMaQI>+?TH(0&)2m!3oDyQV&4)ZX=G~pao@!G
zo9~vJ_+Zf4>bjo3ij$C;aq9N;%;53S@jRFXWM)PPW+t(f`Lx+Te7czh1av;WdSuPj
zH}$huW?HYGUylKfjhq-iIW~6A2g8>k`Cv5K8Q*?y(Dg<n(fKq#yYcMqq?y^kwJBVy
zk;MSPu-qUwk(-etI>Gq7vWYhlMGpUC@on?zok=VEzV`CL6QIbzz`ThZqX5B|ziqmu
zSQ3iehV3#m|3eIbH{pTCcE+!*j3|nz#*VZiLK^KFatx3o%dLO}#L{|)v=UKIL|SpA
ziRje#03eyCaCgqACPrUU0+Qkft=jG*6Bl}jBT;p*9Ri1YV$#yRfQY2N2cVY7>Qxat
z$TQ<;Z&UzE_j=->wnquA<)wwy)L9&vwYyy(LY8N-P$Dc6dE#g<e_xa&fSuitnNdE(
rKmt^NYPl0YfCsujr#!nrW@h0Z;jQ(xd^vpX00000NkvXXu0mjfTj?!<

diff --git a/data/icons/interact.png b/data/icons/interact.png
deleted file mode 100644
index acc65b7a96d477112f9f2fde797f9a38a9ca2a27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 968
zcmV;(12_DMP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000D?000D?0em!Tp#T5?8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H114T(hK~y-6byI6hlV=ouzJ8yfAGU=KkhY;MDzaguP%P!9E0@L_
z(V%35XhfxoF;n9YFMo_b)Tjx}QMWla?}n;Fmk`)AM9H{jqgVvxrdW{TfC^gVChb@H
z`a?^)Wt`+BZ}Ob?Jm);`^MVk9xiU<llwP_~(sA_oNz+_4Jov=MoXx9GoGJW$X>^PT
z0Mzl?H3?d6luD)2Vve8)As-JE#WR)OeVMNNQhuuNtT}W+2(45qmI_27)@HN4y;oj-
zvht4#WB%?v`v~yQl?&(Z{;L51<mPSPotB}$ker}JkT?)7j>AWo!2Ws!WfkT9Sy>z9
zJv~-?(dkp_<|gwX<2w!^h}NYfgQjWRe^AxaXR|%@xZNYmHJSp6R2rO`p_jLJc6i!a
zT7GVBG7oz1&D($I$PfDu9{#ShtbDw;{}m}b_hWmgRO;syN|TTncBc6I2lr|ki1C-p
z!vI9HB5D$o;&vGf->hA`?m%Q@q+sy%Fln|tIyy8k;Pf&y{r%S~`_SNRhM}=cr3%(%
z=)dw}JU*Z8D>0eAt*ftVr6>yTr=55+GTi%LwQH&#*1B9S55q9XGwdwBdb_k{)w;~j
znYur#h5#H~ri$6LVg35wL_#4I9ji_Q(Bj)5Rj>bAC=~KM9uLCgasf@#$-{R0^sEm?
zM;+CT=B6=!)(^3<>b-e}g3X_vm(rzYq$j1U+{Z8sERBs_=ZcEbeli-@JhnXQqX;2L
z(WQ#F<s0sYN@NLQaUh%=2N%bY7tf#7&-b4%TNtr;G0XbHIsG2zjl~6bZkjH7i5UPG
zbvQVdW&LO#9Jfp*l`-l#{gN-Df@9;BucT=jG)-fCYzzQFoF-oGyBY%k?N3@KGP5@2
zzH_|g>T9Zd;uDjiwrtx`sa&*3-fFR!ZGFAfLBSzx?$)h)1ww%yz%d{5{QoDp_UoOt
zhL)!!J0~}@yStkvgy6v8BLypTsbb%{Su5M^cDA##^Ruq5u0X5R8ZhbPvPA&_Vci{V
z*JU!<ghV2ll*we13WZ`kA|k?}R4S)tR{((8+S+NcSUl!-yFG5Vn;RJ#xYgflW%+zQ
q$8p@m%*@O<fGGfz;o;#^Ug8fG>!Hl7<wPt10000<MNUMnLSTXtgUwR_

diff --git a/lib/gui_lite.py b/lib/gui_lite.py
index 75825760..af4fcafa 100644
--- a/lib/gui_lite.py
+++ b/lib/gui_lite.py
@@ -109,33 +109,33 @@ class MiniWindow(QDialog):
 
         self.actuator = actuator
 
-        accounts_button = IconButton(rsrc("icons", "accounts.png"))
-        accounts_button.setObjectName("accounts_button")
+        #accounts_button = IconButton(rsrc("icons", "accounts.png"))
+        #accounts_button.setObjectName("accounts_button")
 
-        self.accounts_selector = QMenu()
-        accounts_button.setMenu(self.accounts_selector)
+        #self.accounts_selector = QMenu()
+        #accounts_button.setMenu(self.accounts_selector)
 
-        interact_button = IconButton(rsrc("icons", "interact.png"))
-        interact_button.setObjectName("interact_button")
+        #interact_button = IconButton(rsrc("icons", "interact.png"))
+        #interact_button.setObjectName("interact_button")
 
-        app_menu = QMenu(interact_button)
-        acceptbit_action = app_menu.addAction(_("A&cceptBit"))
-        report_action = app_menu.addAction(_("&Report Bug"))
-        about_action = app_menu.addAction(_("&About Electrum"))
-        app_menu.addSeparator()
-        quit_action = app_menu.addAction(_("&Quit"))
-        interact_button.setMenu(app_menu)
+        #app_menu = QMenu(interact_button)
+        #acceptbit_action = app_menu.addAction(_("A&cceptBit"))
+        #report_action = app_menu.addAction(_("&Report Bug"))
+        #about_action = app_menu.addAction(_("&About Electrum"))
+        #app_menu.addSeparator()
+        #quit_action = app_menu.addAction(_("&Quit"))
+        #interact_button.setMenu(app_menu)
 
-        self.connect(acceptbit_action, SIGNAL("triggered()"),
-                     self.acceptbit)
-        self.connect(report_action, SIGNAL("triggered()"),
-                     self.show_report_bug)
-        self.connect(about_action, SIGNAL("triggered()"), self.show_about)
-        self.connect(quit_action, SIGNAL("triggered()"), self.close)
+        #self.connect(acceptbit_action, SIGNAL("triggered()"),
+        #             self.acceptbit)
+        #self.connect(report_action, SIGNAL("triggered()"),
+        #             self.show_report_bug)
+        #self.connect(about_action, SIGNAL("triggered()"), self.show_about)
+        #self.connect(quit_action, SIGNAL("triggered()"), self.close)
 
-        expand_button = IconButton(rsrc("icons", "expand.png"))
-        expand_button.setObjectName("expand_button")
-        self.connect(expand_button, SIGNAL("clicked()"), expand_callback)
+        #expand_button = IconButton(rsrc("icons", "expand.png"))
+        #expand_button.setObjectName("expand_button")
+        #self.connect(expand_button, SIGNAL("clicked()"), expand_callback)
 
         self.btc_balance = None
         self.quote_currencies = ["EUR", "USD", "GBP"]
@@ -196,17 +196,19 @@ class MiniWindow(QDialog):
         self.connect(send_button, SIGNAL("clicked()"), self.send)
 
         main_layout = QGridLayout(self)
-        main_layout.addWidget(accounts_button, 0, 0)
-        main_layout.addWidget(interact_button, 1, 0)
-        main_layout.addWidget(expand_button, 2, 0)
 
-        main_layout.addWidget(self.balance_label, 0, 1)
-        main_layout.addWidget(self.receive_button, 0, 2)
+        main_layout.addWidget(self.balance_label, 0, 0)
+        main_layout.addWidget(self.receive_button, 0, 1)
 
-        main_layout.addLayout(address_layout, 1, 1, 1, -1)
+        main_layout.addWidget(self.address_input, 1, 0, 1, -1)
 
-        main_layout.addLayout(amount_layout, 2, 1)
-        main_layout.addWidget(send_button, 2, 2)
+        main_layout.addLayout(amount_layout, 2, 0)
+        main_layout.addWidget(send_button, 2, 1)
+
+        menubar = QMenuBar()
+        file_menu = menubar.addMenu(_("&File"))
+        file_menu.addAction(_("Open"))
+        main_layout.setMenuBar(menubar)
 
         quit_shortcut = QShortcut(QKeySequence("Ctrl+Q"), self)
         self.connect(quit_shortcut, SIGNAL("activated()"), self.close)