commit 04b9d8fffa3f9b92ff9eb9d9b7ed6ec69396f2cb
parent eca24ec396300b57f3503e3fa10ee14db6728683
Author: ThomasV <thomasv@electrum.org>
Date: Thu, 3 Sep 2015 15:09:45 +0200
Update kivy GUI in order to merge with master
Diffstat:
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/gui/kivy/__init__.py b/gui/kivy/__init__.py
@@ -76,7 +76,7 @@ class ElectrumGui:
#self.current_window.pary_from_URI
pass
- def main(self, url):
+ def main(self):
''' The main entry point of the kivy ux
:param url: 'bitcoin:' uri as mentioned in bip0021
:type url: str
@@ -85,6 +85,5 @@ class ElectrumGui:
self.main_window = w = ElectrumWindow(config=self.config,
network=self.network,
- url=url,
gui_object=self)
- w.run()-
\ No newline at end of file
+ w.run()
diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py
@@ -251,7 +251,7 @@ class ElectrumWindow(App):
self.on_size(win, win.size)
config = self.electrum_config
- storage = WalletStorage(config)
+ storage = WalletStorage(config.get_wallet_path())
Logger.info('Electrum: Check for existing wallet')
@@ -599,7 +599,7 @@ class ElectrumWindow(App):
def parse_histories(self, items):
for item in items:
- tx_hash, conf, is_mine, value, fee, balance, timestamp = item
+ tx_hash, conf, value, timestamp, balance = item
time_str = _("unknown")
if conf > 0:
try:
@@ -644,7 +644,7 @@ class ElectrumWindow(App):
except AttributeError:
return
histories = self.parse_histories(reversed(
- self.wallet.get_tx_history(self.current_account)))
+ self.wallet.get_history(self.current_account)))
# repopulate History Card
last_widget = history_card.ids.content.children[-1]
@@ -892,7 +892,8 @@ class ElectrumWindow(App):
'''
if not self.network or not self.network.is_connected():
return
-
+ # temporarily disabled for merge
+ return
iface = self.network
ptfn = iface.pending_transactions_for_notifications
if len(ptfn) > 0:
diff --git a/gui/kivy/plugins/exchange_rate.py b/gui/kivy/plugins/exchange_rate.py
@@ -153,6 +153,9 @@ class Exchanger(EventDispatcher):
if not self.parent.network or not self.parent.network.is_connected():
return
+ # temporarily disabled
+ return
+
update_rates = {
"BitcoinAverage": self.update_ba,
"BitcoinVenezuela": self.update_bv,
diff --git a/gui/kivy/uix/ui_screens/mainscreen.kv b/gui/kivy/uix/ui_screens/mainscreen.kv
@@ -268,7 +268,7 @@
id: fee_e
color: .761, .761, .761, 1
font_size: '12dp'
- amt: app.format_amount(app.wallet.fee) if app.wallet else 0
+ amt: app.format_amount(app.wallet.fee_per_kb(app.gui_object.config)) if app.wallet else 0
text:
u'[b]{sign}{symbl}{amt}[/b] of fee'.\
format(symbl=lbl_symbl.text,\
diff --git a/lib/commands.py b/lib/commands.py
@@ -740,7 +740,7 @@ def get_parser():
parser_gui = subparsers.add_parser('gui', parents=[parent_parser], description="Run Electrum's Graphical User Interface.", help="Run GUI (default)")
parser_gui.add_argument("url", nargs='?', default=None, help="bitcoin URI (or bip70 file)")
#parser_gui.set_defaults(func=run_gui)
- parser_gui.add_argument("-g", "--gui", dest="gui", help="select graphical user interface", choices=['qt', 'lite', 'gtk', 'text', 'stdio', 'jsonrpc'])
+ parser_gui.add_argument("-g", "--gui", dest="gui", help="select graphical user interface", choices=['qt', 'lite', 'gtk', 'kivy', 'text', 'stdio', 'jsonrpc'])
parser_gui.add_argument("-m", action="store_true", dest="hide_gui", default=False, help="hide GUI on startup")
parser_gui.add_argument("-L", "--lang", dest="language", default=None, help="default language used in GUI")
add_network_options(parser_gui)
