diff --git a/.gitignore b/.gitignore
index dae35e75..69d0e6d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,8 @@ bin/
# tox files
.cache/
.coverage
+
+electrum_data/
+gui/kivy/theming/light-0.png
+gui/kivy/theming/light.atlas
+Electrum_DASH.egg-info/
diff --git a/gui/kivy/i18n.py b/gui/kivy/i18n.py
index e0be3908..4721247a 100644
--- a/gui/kivy/i18n.py
+++ b/gui/kivy/i18n.py
@@ -35,7 +35,7 @@ class _(str):
@staticmethod
def switch_lang(lang):
# get the right locales directory, and instanciate a gettext
- from electrum.i18n import LOCALE_DIR
+ from electrum_zcash.i18n import LOCALE_DIR
locales = gettext.translation('electrum', LOCALE_DIR, languages=[lang], fallback=True)
_.lang = locales.gettext
for label in _.observers:
diff --git a/gui/kivy/main.kv b/gui/kivy/main.kv
index 853ddd94..b3c2e7e8 100644
--- a/gui/kivy/main.kv
+++ b/gui/kivy/main.kv
@@ -1,7 +1,7 @@
#:import Clock kivy.clock.Clock
#:import Window kivy.core.window.Window
#:import Factory kivy.factory.Factory
-#:import _ electrum_gui.kivy.i18n._
+#:import _ electrum_zcash_gui.kivy.i18n._
###########################
diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py
index 2cc1386c..269fe395 100644
--- a/gui/kivy/main_window.py
+++ b/gui/kivy/main_window.py
@@ -7,15 +7,15 @@ import traceback
from decimal import Decimal
import threading
-import electrum
-from electrum.bitcoin import TYPE_ADDRESS
-from electrum import WalletStorage, Wallet
-from electrum_gui.kivy.i18n import _
-from electrum.paymentrequest import InvoiceStore
-from electrum.util import profiler, InvalidPassword
-from electrum.plugins import run_hook
-from electrum.util import format_satoshis, format_satoshis_plain
-from electrum.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED
+import electrum_zcash
+from electrum_zcash.bitcoin import TYPE_ADDRESS
+from electrum_zcash import WalletStorage, Wallet
+from electrum_zcash_gui.kivy.i18n import _
+from electrum_zcash.paymentrequest import InvoiceStore
+from electrum_zcash.util import profiler, InvalidPassword
+from electrum_zcash.plugins import run_hook
+from electrum_zcash.util import format_satoshis, format_satoshis_plain
+from electrum_zcash.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED
from kivy.app import App
from kivy.core.window import Window
@@ -30,10 +30,10 @@ from kivy.metrics import inch
from kivy.lang import Builder
## lazy imports for factory so that widgets can be used in kv
-#Factory.register('InstallWizard', module='electrum_gui.kivy.uix.dialogs.installwizard')
-#Factory.register('InfoBubble', module='electrum_gui.kivy.uix.dialogs')
-#Factory.register('OutputList', module='electrum_gui.kivy.uix.dialogs')
-#Factory.register('OutputItem', module='electrum_gui.kivy.uix.dialogs')
+#Factory.register('InstallWizard', module='electrum_zcash_gui.kivy.uix.dialogs.installwizard')
+#Factory.register('InfoBubble', module='electrum_zcash_gui.kivy.uix.dialogs')
+#Factory.register('OutputList', module='electrum_zcash_gui.kivy.uix.dialogs')
+#Factory.register('OutputItem', module='electrum_zcash_gui.kivy.uix.dialogs')
from .uix.dialogs.installwizard import InstallWizard
from .uix.dialogs import InfoBubble
@@ -48,14 +48,14 @@ util = False
# register widget cache for keeping memory down timeout to forever to cache
# the data
-Cache.register('electrum_widgets', timeout=0)
+Cache.register('electrum_zcash_widgets', timeout=0)
from kivy.uix.screenmanager import Screen
from kivy.uix.tabbedpanel import TabbedPanel
from kivy.uix.label import Label
from kivy.core.clipboard import Clipboard
-Factory.register('TabbedCarousel', module='electrum_gui.kivy.uix.screens')
+Factory.register('TabbedCarousel', module='electrum_zcash_gui.kivy.uix.screens')
# Register fonts without this you won't be able to use bold/italic...
# inside markup.
@@ -67,7 +67,7 @@ Label.register('Roboto',
'gui/kivy/data/fonts/Roboto-Bold.ttf')
-from electrum.util import base_units
+from electrum_zcash.util import base_units
class ElectrumWindow(App):
@@ -95,7 +95,7 @@ class ElectrumWindow(App):
from .uix.dialogs.choice_dialog import ChoiceDialog
protocol = 's'
def cb2(host):
- from electrum.bitcoin import NetworkConstants
+ from electrum_zcash.bitcoin import NetworkConstants
pp = servers.get(host, NetworkConstants.DEFAULT_PORTS)
port = pp.get(protocol, '')
popup.ids.host.text = host
@@ -128,7 +128,7 @@ class ElectrumWindow(App):
self.send_screen.set_URI(uri)
def on_new_intent(self, intent):
- if intent.getScheme() != 'bitcoin':
+ if intent.getScheme() != 'zcash':
return
uri = intent.getDataString()
self.set_URI(uri)
@@ -150,7 +150,7 @@ class ElectrumWindow(App):
self._trigger_update_history()
def _get_bu(self):
- return self.electrum_config.get('base_unit', 'mBTC')
+ return self.electrum_config.get('base_unit', 'mZEC')
def _set_bu(self, value):
assert value in base_units.keys()
@@ -237,7 +237,7 @@ class ElectrumWindow(App):
App.__init__(self)#, **kwargs)
- title = _('Electrum App')
+ title = _('Electrum-Zcash App')
self.electrum_config = config = kwargs.get('config', None)
self.language = config.get('language', 'en')
self.network = network = kwargs.get('network', None)
@@ -290,17 +290,17 @@ class ElectrumWindow(App):
self.send_screen.do_clear()
def on_qr(self, data):
- from electrum.bitcoin import base_decode, is_address
+ from electrum_zcash.bitcoin import base_decode, is_address
data = data.strip()
if is_address(data):
self.set_URI(data)
return
- if data.startswith('bitcoin:'):
+ if data.startswith('zcash:'):
self.set_URI(data)
return
# try to decode transaction
- from electrum.transaction import Transaction
- from electrum.util import bh2u
+ from electrum_zcash.transaction import Transaction
+ from electrum_zcash.util import bh2u
try:
text = bh2u(base_decode(data, None, base=43))
tx = Transaction(text)
@@ -337,7 +337,7 @@ class ElectrumWindow(App):
self.receive_screen.screen.address = addr
def show_pr_details(self, req, status, is_invoice):
- from electrum.util import format_time
+ from electrum_zcash.util import format_time
requestor = req.get('requestor')
exp = req.get('exp')
memo = req.get('memo')
@@ -359,7 +359,7 @@ class ElectrumWindow(App):
popup.open()
def show_addr_details(self, req, status):
- from electrum.util import format_time
+ from electrum_zcash.util import format_time
fund = req.get('fund')
isaddr = 'y'
popup = Builder.load_file('gui/kivy/uix/ui_screens/invoice.kv')
@@ -440,7 +440,7 @@ class ElectrumWindow(App):
self.fiat_unit = self.fx.ccy if self.fx.is_enabled() else ''
# default tab
self.switch_to('history')
- # bind intent for bitcoin: URI scheme
+ # bind intent for zcash: URI scheme
if platform == 'android':
from android import activity
from jnius import autoclass
@@ -483,7 +483,7 @@ class ElectrumWindow(App):
self.load_wallet(wallet)
self.on_resume()
else:
- Logger.debug('Electrum: Wallet not found. Launching install wizard')
+ Logger.debug('Electrum-Zcash: Wallet not found. Launching install wizard')
storage = WalletStorage(path)
wizard = Factory.InstallWizard(self.electrum_config, storage)
wizard.bind(on_wizard_complete=self.on_wizard_complete)
@@ -558,13 +558,13 @@ class ElectrumWindow(App):
#setup lazy imports for mainscreen
Factory.register('AnimatedPopup',
- module='electrum_gui.kivy.uix.dialogs')
+ module='electrum_zcash_gui.kivy.uix.dialogs')
Factory.register('QRCodeWidget',
- module='electrum_gui.kivy.uix.qrcodewidget')
+ module='electrum_zcash_gui.kivy.uix.qrcodewidget')
# preload widgets. Remove this if you want to load the widgets on demand
- #Cache.append('electrum_widgets', 'AnimatedPopup', Factory.AnimatedPopup())
- #Cache.append('electrum_widgets', 'QRCodeWidget', Factory.QRCodeWidget())
+ #Cache.append('electrum_zcash_widgets', 'AnimatedPopup', Factory.AnimatedPopup())
+ #Cache.append('electrum_zcash_widgets', 'QRCodeWidget', Factory.QRCodeWidget())
# load and focus the ui
self.root.manager = self.root.ids['manager']
@@ -576,7 +576,7 @@ class ElectrumWindow(App):
self.receive_screen = None
self.requests_screen = None
self.address_screen = None
- self.icon = "icons/electrum.png"
+ self.icon = "icons/electrum-zcash.png"
self.tabs = self.root.ids['tabs']
def update_interfaces(self, dt):
@@ -665,7 +665,7 @@ class ElectrumWindow(App):
from plyer import notification
icon = (os.path.dirname(os.path.realpath(__file__))
+ '/../../' + self.icon)
- notification.notify('Electrum', message,
+ notification.notify('Electrum-Zcash', message,
app_icon=icon, app_name='Electrum')
except ImportError:
Logger.Error('Notification: needs plyer; `sudo pip install plyer`')
diff --git a/gui/kivy/nfc_scanner/__init__.py b/gui/kivy/nfc_scanner/__init__.py
index fd3d263a..44819b36 100644
--- a/gui/kivy/nfc_scanner/__init__.py
+++ b/gui/kivy/nfc_scanner/__init__.py
@@ -41,4 +41,4 @@ class NFCBase(Widget):
NFCScanner = core_select_lib('nfc_manager', (
# keep the dummy implementtation as the last one to make it the fallback provider.NFCScanner = core_select_lib('nfc_scanner', (
('android', 'scanner_android', 'ScannerAndroid'),
- ('dummy', 'scanner_dummy', 'ScannerDummy')), True, 'electrum_gui.kivy')
+ ('dummy', 'scanner_dummy', 'ScannerDummy')), True, 'electrum_zcash_gui.kivy')
diff --git a/gui/kivy/nfc_scanner/scanner_android.py b/gui/kivy/nfc_scanner/scanner_android.py
index b8f86029..c9cce5a3 100644
--- a/gui/kivy/nfc_scanner/scanner_android.py
+++ b/gui/kivy/nfc_scanner/scanner_android.py
@@ -10,7 +10,7 @@ if platform != 'android':
raise ImportError
import threading
-from electrum_gui.kivy.nfc_scanner import NFCBase
+from electrum_zcash_gui.kivy.nfc_scanner import NFCBase
from jnius import autoclass, cast
from android.runnable import run_on_ui_thread
from android import activity
@@ -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.kivy"))
+ return NdefRecord.createApplicationRecord(JString("org.electrum-zcash.kivy"))
def create_TNF_EXTERNAL(self, data):
'''Create our actual payload record.
'''
if BUILDVERSION >= 14:
- domain = "org.electrum"
+ domain = "org.electrum-zcash"
stype = "externalType"
extRecord = NdefRecord.createExternal(domain, stype, data)
else:
# Creating the NdefRecord manually:
extRecord = NdefRecord(
NdefRecord.TNF_EXTERNAL_TYPE,
- "org.electrum:externalType",
+ "org.electrum-zcash:externalType",
'',
data)
return extRecord
@@ -213,7 +213,7 @@ class ScannerAndroid(NFCBase):
# Create record
ndef_record = NdefRecord(
NdefRecord.TNF_MIME_MEDIA,
- 'org.electrum.kivy', '', data)
+ 'org.electrum-zcash.kivy', '', data)
# Create message
ndef_message = NdefMessage([ndef_record])
diff --git a/gui/kivy/nfc_scanner/scanner_dummy.py b/gui/kivy/nfc_scanner/scanner_dummy.py
index 1ad2c17a..27b6a4a4 100644
--- a/gui/kivy/nfc_scanner/scanner_dummy.py
+++ b/gui/kivy/nfc_scanner/scanner_dummy.py
@@ -1,6 +1,6 @@
''' Dummy NFC Provider to be used on desktops in case no other provider is found
'''
-from electrum_gui.kivy.nfc_scanner import NFCBase
+from electrum_zcash_gui.kivy.nfc_scanner import NFCBase
from kivy.clock import Clock
from kivy.logger import Logger
diff --git a/gui/kivy/tools/bitcoin_intent.xml b/gui/kivy/tools/bitcoin_intent.xml
index f433f72c..066f2aeb 100644
--- a/gui/kivy/tools/bitcoin_intent.xml
+++ b/gui/kivy/tools/bitcoin_intent.xml
@@ -3,5 +3,5 @@
-
+
diff --git a/gui/kivy/tools/buildozer.spec b/gui/kivy/tools/buildozer.spec
index b3679889..64aa8dd7 100644
--- a/gui/kivy/tools/buildozer.spec
+++ b/gui/kivy/tools/buildozer.spec
@@ -1,13 +1,13 @@
[app]
# (str) Title of your application
-title = Electrum
+title = Electrum-Zcash
# (str) Package name
-package.name = Electrum
+package.name = Electrum-Zcash
# (str) Package domain (needed for android/ios packaging)
-package.domain = org.electrum
+package.domain = org.electrum-zcash
# (str) Source code where the main.py live
source.dir = .
diff --git a/gui/kivy/uix/context_menu.py b/gui/kivy/uix/context_menu.py
index dee0212a..3d4e8a56 100644
--- a/gui/kivy/uix/context_menu.py
+++ b/gui/kivy/uix/context_menu.py
@@ -8,7 +8,7 @@ from kivy.lang import Builder
from kivy.factory import Factory
from kivy.clock import Clock
-from electrum_gui.kivy.i18n import _
+from electrum_zcash_gui.kivy.i18n import _
Builder.load_string('''