From 287675ebf76a4120014b53e553c953837577507b Mon Sep 17 00:00:00 2001 From: zebra-lucky Date: Wed, 25 Jul 2018 04:12:41 +0300 Subject: [PATCH] change domains, kivy base unit --- gui/kivy/main_window.py | 2 +- gui/kivy/nfc_scanner/scanner_android.py | 8 ++++---- gui/kivy/tools/buildozer.spec | 2 +- gui/kivy/uix/ui_screens/about.kv | 4 ++-- lib/commands.py | 4 ++-- lib/util.py | 2 +- setup.py | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py index d93365d9..c4214fb0 100644 --- a/gui/kivy/main_window.py +++ b/gui/kivy/main_window.py @@ -154,7 +154,7 @@ class ElectrumWindow(App): self._trigger_update_history() def _get_bu(self): - return self.electrum_config.get('base_unit', 'mZEC') + return self.electrum_config.get('base_unit', 'ZEC') def _set_bu(self, value): assert value in base_units.keys() diff --git a/gui/kivy/nfc_scanner/scanner_android.py b/gui/kivy/nfc_scanner/scanner_android.py index 110c416a..0d7e467d 100644 --- a/gui/kivy/nfc_scanner/scanner_android.py +++ b/gui/kivy/nfc_scanner/scanner_android.py @@ -165,20 +165,20 @@ class ScannerAndroid(NFCBase): def create_AAR(self): '''Create the record responsible for linking our application to the tag. ''' - return NdefRecord.createApplicationRecord(JString("org.electrum-zcash.kivy")) + return NdefRecord.createApplicationRecord(JString("cash.z.electrum.kivy")) def create_TNF_EXTERNAL(self, data): '''Create our actual payload record. ''' if BUILDVERSION >= 14: - domain = "org.electrum-zcash" + domain = "cash.z.electrum" stype = "externalType" extRecord = NdefRecord.createExternal(domain, stype, data) else: # Creating the NdefRecord manually: extRecord = NdefRecord( NdefRecord.TNF_EXTERNAL_TYPE, - "org.electrum-zcash:externalType", + "cash.z.electrum:externalType", '', data) return extRecord @@ -213,7 +213,7 @@ class ScannerAndroid(NFCBase): # Create record ndef_record = NdefRecord( NdefRecord.TNF_MIME_MEDIA, - 'org.electrum-zcash.kivy', '', data) + 'cash.z.electrum.kivy', '', data) # Create message ndef_message = NdefMessage([ndef_record]) diff --git a/gui/kivy/tools/buildozer.spec b/gui/kivy/tools/buildozer.spec index a9f36c8f..7d61e427 100644 --- a/gui/kivy/tools/buildozer.spec +++ b/gui/kivy/tools/buildozer.spec @@ -7,7 +7,7 @@ title = Electrum-Zcash package.name = Electrum-Zcash # (str) Package domain (needed for android/ios packaging) -package.domain = org.electrum-zcash +package.domain = cash.z.electrum # (str) Source code where the main.py live source.dir = . diff --git a/gui/kivy/uix/ui_screens/about.kv b/gui/kivy/uix/ui_screens/about.kv index f0ac49bd..55ac6efc 100644 --- a/gui/kivy/uix/ui_screens/about.kv +++ b/gui/kivy/uix/ui_screens/about.kv @@ -26,10 +26,10 @@ Popup: size_hint_x: 0.4 TopLabel: markup: True - text: '[color=6666ff][ref=x]https://electrum-zcash.org[/ref][/color]' + text: '[color=6666ff][ref=x]https://electrum.z.cash[/ref][/color]' on_ref_press: import webbrowser - webbrowser.open("https://electrum-zcash.org") + webbrowser.open("https://electrum.z.cash") size_hint_x: 0.6 TopLabel: text: _('Developers') diff --git a/lib/commands.py b/lib/commands.py index 613d80f5..d24cd8bb 100644 --- a/lib/commands.py +++ b/lib/commands.py @@ -750,10 +750,10 @@ config_variables = { 'requests_dir': 'directory where a bip70 file will be written.', 'ssl_privkey': 'Path to your SSL private key, needed to sign the request.', 'ssl_chain': 'Chain of SSL certificates, needed for signed requests. Put your certificate at the top and the root CA at the end', - 'url_rewrite': 'Parameters passed to str.replace(), in order to create the r= part of zcash: URIs. Example: \"(\'file:///var/www/\',\'https://electrum.org/\')\"', + 'url_rewrite': 'Parameters passed to str.replace(), in order to create the r= part of zcash: URIs. Example: \"(\'file:///var/www/\',\'https://electrum.z.cash/\')\"', }, 'listrequests':{ - 'url_rewrite': 'Parameters passed to str.replace(), in order to create the r= part of zcash: URIs. Example: \"(\'file:///var/www/\',\'https://electrum.org/\')\"', + 'url_rewrite': 'Parameters passed to str.replace(), in order to create the r= part of zcash: URIs. Example: \"(\'file:///var/www/\',\'https://electrum.z.cash/\')\"', } } diff --git a/lib/util.py b/lib/util.py index 01e90d57..85d19def 100644 --- a/lib/util.py +++ b/lib/util.py @@ -313,7 +313,7 @@ def android_data_dir(): return PythonActivity.mActivity.getFilesDir().getPath() + '/data' def android_headers_dir(): - d = android_ext_dir() + '/org.electrum-zcash.electrum-zcash' + d = android_ext_dir() + '/cash.z.electrum.electrum_zcash' if not os.path.exists(d): os.mkdir(d) return d diff --git a/setup.py b/setup.py index d0df5cbe..4305bc14 100755 --- a/setup.py +++ b/setup.py @@ -84,6 +84,6 @@ setup( author="Thomas Voegtlin", author_email="thomasv@electrum.org", license="MIT License", - url="https://electrum-zcash.org", + url="https://github.com/zebra-lucky/electrum-zcash", long_description="""Lightweight Zcash Wallet""" )