include NFC changes required for transferring data

2014-08-01 21:39:34 +05:30
parent f2fc18fe32
commit cd4f8a074c
8 changed files with 236 additions and 55 deletions
--- a/gui/kivy/uix/ui_screens/mainscreen.kv
+++ b/gui/kivy/uix/ui_screens/mainscreen.kv
@@ -489,6 +489,7 @@
 <ScreenReceive>
    mode: 'qr'
    name: 'receive'
+    on_mode: if args[1] == 'nfc': from electrum_gui.kivy.nfc_scanner import NFCScanner
    action_view: Factory.ReceiveActionView()
    on_activate:
        self.ids.toggle_qr.state = 'down'