From aff2820217940053e9ab4b7cf55dd1d088323747 Mon Sep 17 00:00:00 2001 From: Amir Taaki Date: Mon, 23 Jul 2012 20:59:11 +0200 Subject: [PATCH 1/4] Added Tachikoma and coblee. --- AUTHORS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index 24cbe9d01..0ee8cd471 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,4 +2,6 @@ ThomasV - authored Electrum flatfly - windows build author genjix - worked on server and parts of the gui Julian Tosh (Tuxavant) - various changes +Tachikoma - Mac version, and various fixes to the gui +coblee - Litecoin support in the server. From 04300ea54594a791c96f879d0d7e67e893b9d68d Mon Sep 17 00:00:00 2001 From: Amir Taaki Date: Mon, 23 Jul 2012 21:00:45 +0200 Subject: [PATCH 2/4] updated coblee description. --- AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 0ee8cd471..5a4a69a3a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,5 +3,5 @@ flatfly - windows build author genjix - worked on server and parts of the gui Julian Tosh (Tuxavant) - various changes Tachikoma - Mac version, and various fixes to the gui -coblee - Litecoin support in the server. +coblee - Litecoin support in the server, Mac installer. From 05dc59a5c9c7a60dc645fe7da0117c829b2e51dc Mon Sep 17 00:00:00 2001 From: Amir Taaki Date: Mon, 30 Jul 2012 20:34:59 -0300 Subject: [PATCH 3/4] 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 | 72 +++++++++++++++++++++------------------- 4 files changed, 37 insertions(+), 35 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)$+_^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$@^9g4)X`^=o{4$NJ6{f``TN!AE+}87{BiO8vR4tIgiV&S1;TyE>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%Y3NBi714YR6!JlzccT>-F=&o#2-ye8WSuG64F?x2!dEC z+G$}Qg8mu7#=+?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(DgGq7vWYhlMGpUC@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^PT z0Mzl?H3?d6luD)2Vve8)As-JE#WR)OeVMNNQhuuNtT}W+2(45qmI_27)@HN4y;oj- zvht4#WB%?v`v~yQl?&(Z{;L51AWo!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#FT9Zd;uDjiwrtx`sa&*3-fFR!ZGFAfLBSzx?$)h)1ww%yz%d{5{QoDp_UoOt zhL)!!J0~}@yStkvgy6v8BLypTsbb%{Su5M^cDA##^Ruq5u0X5R8ZhbPvPA&_Vci{V z*JU!!Hl7 Date: Tue, 31 Jul 2012 13:00:55 -0300 Subject: [PATCH 4/4] Added menubar. --- lib/gui_lite.py | 40 ++++++---------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/lib/gui_lite.py b/lib/gui_lite.py index af4fcafa8..4316e58cb 100644 --- a/lib/gui_lite.py +++ b/lib/gui_lite.py @@ -109,34 +109,6 @@ class MiniWindow(QDialog): self.actuator = actuator - #accounts_button = IconButton(rsrc("icons", "accounts.png")) - #accounts_button.setObjectName("accounts_button") - - #self.accounts_selector = QMenu() - #accounts_button.setMenu(self.accounts_selector) - - #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) - - #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) - self.btc_balance = None self.quote_currencies = ["EUR", "USD", "GBP"] self.actuator.set_configured_currency(self.set_quote_currency) @@ -208,6 +180,11 @@ class MiniWindow(QDialog): menubar = QMenuBar() file_menu = menubar.addMenu(_("&File")) file_menu.addAction(_("Open")) + view_menu = menubar.addMenu(_("&View")) + view_menu.addMenu(_("&Themes")) + view_menu.addAction(_("Show History")) + menubar.addMenu(_("&Settings")) + menubar.addMenu(_("&Help")) main_layout.setMenuBar(menubar) quit_shortcut = QShortcut(QKeySequence("Ctrl+Q"), self) @@ -266,12 +243,7 @@ class MiniWindow(QDialog): quote_text = "(%s)" % quote_text btc_balance = "%.2f" % (btc_balance / bitcoin(1)) self.balance_label.set_balance_text(btc_balance, quote_text) - main_account_info = \ - "Checking - %s BTC" % btc_balance - self.setWindowTitle("Electrum - %s" % main_account_info) - self.accounts_selector.clear() - self.accounts_selector.addAction("%s %s" % (main_account_info, - quote_text)) + self.setWindowTitle("Electrum - %s BTC" % btc_balance) def amount_input_changed(self, amount_text): try: