electrum

commit 5120c24a0bb6ae08e4075cbce7f58636df54220b
parent 6ccb1dd207dd5604016f5b0056afb17e69773b6d
Author: ThomasV <thomasv@electrum.org>
Date:   Sat,  6 Feb 2016 16:58:31 +0100

kivy: share button

Diffstat:
M
gui/kivy/uix/screens.py
 | 
34
+++++++++++++++++-----------------
M
gui/kivy/uix/ui_screens/receive.kv
 | 
12
++++++++++--

2 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/gui/kivy/uix/screens.py b/gui/kivy/uix/screens.py
@@ -16,6 +16,7 @@ from kivy.uix.label import Label
 
 from kivy.lang import Builder
 from kivy.factory import Factory
+from kivy.utils import platform
 
 from electrum.util import profiler, parse_URI, format_time
 from electrum import bitcoin
@@ -293,25 +294,24 @@ class ReceiveScreen(CScreen):
         qr = self.screen.ids.qr
         qr.set_data(uri)
 
-    def do_copy(self):
-        from kivy.utils import platform
-
-        uri = self.get_URI()
-
-        if platform == 'android':
-            from jnius import autoclass, cast
-            JS = autoclass('java.lang.String')
-            Intent = autoclass('android.content.Intent')
-            sendIntent = Intent()
-            sendIntent.setAction(Intent.ACTION_SEND)
-            sendIntent.setType("text/plain")
-            sendIntent.putExtra(Intent.EXTRA_TEXT, JS(uri))
-            PythonActivity = autoclass('org.renpy.android.PythonActivity')
-            currentActivity = cast('android.app.Activity', PythonActivity.mActivity)
-            it = Intent.createChooser(sendIntent, cast('java.lang.CharSequence', JS("Share Bitcoin Request")))
-            currentActivity.startActivity(it) 
+    def do_share(self):
+        if platform != 'android':
             return
+        uri = self.get_URI()
+        from jnius import autoclass, cast
+        JS = autoclass('java.lang.String')
+        Intent = autoclass('android.content.Intent')
+        sendIntent = Intent()
+        sendIntent.setAction(Intent.ACTION_SEND)
+        sendIntent.setType("text/plain")
+        sendIntent.putExtra(Intent.EXTRA_TEXT, JS(uri))
+        PythonActivity = autoclass('org.renpy.android.PythonActivity')
+        currentActivity = cast('android.app.Activity', PythonActivity.mActivity)
+        it = Intent.createChooser(sendIntent, cast('java.lang.CharSequence', JS("Share Bitcoin Request")))
+        currentActivity.startActivity(it)
 
+    def do_copy(self):
+        uri = self.get_URI()
         self.app._clipboard.copy(uri)
         self.app.show_info(_('Request copied to clipboard'))
 
diff --git a/gui/kivy/uix/ui_screens/receive.kv b/gui/kivy/uix/ui_screens/receive.kv
@@ -90,14 +90,22 @@ ReceiveScreen:
                 height: '48dp'
                 on_release: s.parent.do_copy()
             Button:
+                text: _('Share')
+                size_hint: 1, None
+                height: '48dp'
+                on_release: s.parent.do_share()
+            Button:
                 text: _('Save')
                 size_hint: 1, None
                 height: '48dp'
                 on_release: s.parent.do_save()
+        BoxLayout:
+            size_hint: 1, None
+            height: '48dp'
+            Widget:
+                size_hint: 1, 1
             Button:
                 text: _('New')
                 size_hint: 1, None
                 height: '48dp'
                 on_release: s.parent.do_new()
-        #Widget:
-        #    size_hint: 1, 0.3