Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gui text cleanup #11

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions RELEASE-NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Usage
-----

When you first run Electron Cash it will use a different configuration directory to Electrum. On Unix it is
".electron-cash", and on Windows/MacOS it is "ElectronCash". Your wallet files will be copied from the Electrum
".electron-cash", and on Windows/MacOS it is "Vilight". Your wallet files will be copied from the Electrum
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to replace .electron-cash references with .vilight

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file paths should be changed to follow system specific file paths. Such as macOS should be in ~/Library/Application Support/Vilight

cofiguration directory (".electrum" on unix, "Electrum" on Windows/MacOS), if found. Initially transactions will show
up as unverified because Electron Cash is downloading the blockchain headers to verify the transactions. This can take
up to 10 minutes, but is only done once.
Expand All @@ -39,7 +39,7 @@ signs transactions using this scheme, so its transactions are only valid on the
has occurred.

If you want to send Bitcoin before the fork, or Segwitcoins after the fork, you should continue to use the standard
Electrum client, Electron Cash will not work.
Electrum client, ViLight will not work.

Once the network forks, it will take time for the Electrum server network to split into servers of the Segwit fork, and
servers of the Bitcoin Cash fork. You should ensure you are connected to a Bitcoin Cash Electrum server in order to
Expand All @@ -57,7 +57,7 @@ Hardware Wallets

Since Bitcoin Cash enforces a new signing scheme, hardware wallet vendors need to supply new firmware and/or libraries
for the hardware to be able to sign transactions correctly. Currently such libraries and firmware do not exist, so you
cannot use your hardware wallets with Electron Cash.
cannot use your hardware wallets with Vilight.

To use Electron Cash with your hardware-wallet coins you will need to restore your wallet as a software Electron Cash
BIP44 wallet from its seed so that Electron Cash can sign the transactions itself. Since this exposes your coins to
Expand All @@ -76,7 +76,7 @@ Multisig
--------

For a multisig transaction to be valid on the Bitcoin Cash fork, each signature must be done thew new Bitcoin Cash way,
so each signature must be performed with Electron Cash or other Bitcoin Cash-compatible software.
so each signature must be performed with Vilight or other Bitcoin Cash-compatible software.

Unfortunately Electron Cash does not currently work with multisig wallets as Electrum's serialization format for
transferring transactions between cosigners is incomplete. We intend to fix this.
Expand Down Expand Up @@ -182,7 +182,7 @@ and there is no warning message.

# Release 3.3

* Add external plugins feature. Please see https://github.com/Electron-Cash/Electron-Cash/blob/master/plugins/README.rst and pay special attention to the risks involved with running external plugins.
* Add external plugins feature. Please see https://github.com/VitaeTeam/ViLight/blob/master/plugins/README.rst and pay special attention to the risks involved with running external plugins.
* Various bugfixes and improvements

# Release 3.3.1
Expand Down Expand Up @@ -508,7 +508,7 @@ and there is no warning message.
closer to that of a mini block explorer. (cculianu)
* KeepKey: Fixed a packaging issue where loading BIP39 onto an uninitialized
KeepKey would fail with a Python exception on Windows & Mac #1434 (cculianu)
* Python 3.6 is officially the minimum Python version for Electron Cash now.
* Python 3.6 is officially the minimum Python version for Vilight now.
In the last version, you could still run on Python 3.5 (poorly), we just
made it official. (Axel Gembe, cculianu)
* Added OP_RETURN capability to the 'Receive' tab. You can now generate receive
Expand Down Expand Up @@ -613,7 +613,7 @@ and there is no warning message.
which causes EC to render fonts badly if using emojis or unicode) (cculianu)
* AppImage: Upgrade to Ubuntu 16.04 as base #1489 (Axel Gembe)
* Build: Protect against PGP keyserver poisoning attack #1487 (Axel Gembe)
* Added electroncash.se server to servers.json (Georg Engelman)
* Added vilight.se server to servers.json (Georg Engelman)
* TxDialog: Allow various fields to be selected by mouse. (cculianu)
* TxDialog: Added the "Mined in block" field to the dialog. (cculianu)
* Localization: The app now defaults to the system language on Windows, Mac and
Expand Down
2 changes: 1 addition & 1 deletion android/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN apt-get update && \
pip3 install polib requests
COPY contrib/make_locale contrib/
COPY gui gui
COPY ios/ElectronCash/electroncash_gui/ios_native ios/ElectronCash/electroncash_gui/ios_native
COPY ios/Vilight/vilight_gui/ios_native ios/Vilight/vilight_gui/ios_native
COPY plugins plugins

# The app itself. Specifically check for the keystore, otherwise it'll build an APK with no
Expand Down
8 changes: 4 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ android {
install "-r", "$REPO_ROOT/contrib/deterministic-build/requirements.txt"
install "-r", "$REPO_ROOT/contrib/deterministic-build/requirements-android.txt"
}
extractPackages "electroncash.locale"
extractPackages "vilight.locale"
}
ndk {
abiFilters "x86", "x86_64", "armeabi-v7a", "arm64-v8a"
Expand All @@ -60,8 +60,8 @@ android {
python {
srcDir REPO_ROOT
include "lib/**" // In ../.. (renamed below)
include("chaquopy/**", "electroncash_gui/**", // In src/main/python
"electroncash_plugins/**") //
include("chaquopy/**", "vilight_gui/**", // In src/main/python
"vilight_plugins/**") //
exclude "**/*.po", "**/*.pot"
}
}
Expand Down Expand Up @@ -126,7 +126,7 @@ afterEvaluate {
def dstDir = task.destinationDir
task.doLast {
def src = "$dstDir/lib"
def dst = "$dstDir/electroncash"
def dst = "$dstDir/vilight"
if (! file(src).renameTo(dst)) {
throw new GradleException("Failed to rename $src to $dst")
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/generate_strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def main():
print(lang_region)
if not lang_region=="__pycache__":
lang, region = lang_region.split("_")
catalog = read_catalog(join(locale_dir, lang_region, "LC_MESSAGES","electron-cash.mo"))
catalog = read_catalog(join(locale_dir, lang_region, "LC_MESSAGES","vilight.mo"))
lang_strings[lang].append((region, catalog))

src_strings = read_catalog(join(locale_dir, "messages.pot"))
Expand Down
6 changes: 3 additions & 3 deletions android/app/src/main/java/cc/vitae/vilight1/Daemon.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ val py by lazy {
Python.start(AndroidPlatform(app))
Python.getInstance()
}
fun libMod(name: String) = py.getModule("electroncash.$name")!!
fun guiMod(name: String) = py.getModule("electroncash_gui.android.$name")!!
fun libMod(name: String) = py.getModule("vilight.$name")!!
fun guiMod(name: String) = py.getModule("vilight_gui.android.$name")!!
val libNetworks by lazy { libMod("networks") }
val guiDaemon by lazy { guiMod("daemon") }

Expand Down Expand Up @@ -62,7 +62,7 @@ class DaemonModel {
watchdog.run()
}

// This function is called from src/main/python/electroncash_gui/android/daemon.py.
// This function is called from src/main/python/vilight_gui/android/daemon.py.
// It will sometimes be called on the main thread and sometimes on the network thread.
@Suppress("unused")
fun onCallback(event: String) {
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/java/cc/vitae/vilight1/Main.kt
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ class MainActivity : AppCompatActivity() {
ft.attach(newFrag)

// BottomNavigationView onClick is sometimes triggered after state has been saved
// (https://github.com/Electron-Cash/Electron-Cash/issues/1091).
// (https://github.com/VitaeTeam/ViLight/issues/1091).
ft.commitNowAllowingStateLoss()
}

Expand Down
12 changes: 6 additions & 6 deletions android/app/src/main/python/electroncash_gui/android/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
import pkg_resources
import unittest

from electroncash import commands, daemon, keystore, simple_config, storage, util
from electroncash.i18n import _
from electroncash.storage import WalletStorage
from electroncash.wallet import (ImportedAddressWallet, ImportedPrivkeyWallet, Standard_Wallet,
from vilight import commands, daemon, keystore, simple_config, storage, util
from vilight.i18n import _
from vilight.storage import WalletStorage
from vilight.wallet import (ImportedAddressWallet, ImportedPrivkeyWallet, Standard_Wallet,
Wallet)

from android.preference import PreferenceManager
Expand Down Expand Up @@ -192,7 +192,7 @@ def unit_test(self):
"""Run all unit tests. Expect failures with functionality not present on Android,
such as Trezor.
"""
test_pkg = "electroncash.tests"
test_pkg = "vilight.tests"
suite = unittest.defaultTestLoader.loadTestsFromNames(
[test_pkg + "." + filename[:-3]
for filename in pkg_resources.resource_listdir(test_pkg, "")
Expand Down Expand Up @@ -230,7 +230,7 @@ def _wallet_path(self, name=""):

# We store the config in the SharedPreferences because it's very easy to base an Android
# settings UI on that. The reverse approach would be harder (using PreferenceDataStore to make
# the settings UI access an Electron Cash config file).
# the settings UI access an Vilight config file).
class AndroidConfig(simple_config.SimpleConfig):
def __init__(self, app):
self.sp = PreferenceManager.getDefaultSharedPreferences(app)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file lists translatable strings used in the Android app which don't appear anywhere else
# in the Electron Cash repository. Some of them only differ in capitalization or punctuation:
# in the Vilight repository. Some of them only differ in capitalization or punctuation:
# see https://medium.com/@jsaito/making-a-case-for-letter-case-19d09f653c98

# If you change anything here, you need to rebuild the Android strings files by running the
Expand Down
8 changes: 4 additions & 4 deletions cc.vitae.ViLight.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
<url type="help">https://github.com/vitaecrypto/Delight/issues?q=is%3Aissue</url>
<screenshots>
<screenshot type="default">
<image type="source">https://www.electroncash.org/images/shot4.png</image>
<image type="source">https://www.https://www.vitaetoken.io//images/shot4.png</image>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrong url scheme

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See I knew I didn't get everything... I keep hunting things down.

<caption>Main application window</caption>
</screenshot>
</screenshots>
<translation type="gettext">electron-cash</translation>
<provides>
<binary>vilight</binary>
<python3>electroncash</python3>
<python3>electroncash_gui</python3>
<python3>electroncash_plugins</python3>
<python3>vilight</python3>
<python3>vilight_gui</python3>
<python3>vilight_plugins</python3>
</provides>
<update_contact>hello@vitae.cc</update_contact>
</component>
4 changes: 2 additions & 2 deletions contrib/build-linux/appimage/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AppImage binary for Electron Cash
AppImage binary for Vilight
============================

✓ _This binary is reproducible: you should be able to generate
Expand Down Expand Up @@ -48,4 +48,4 @@ folder.
## FAQ

### How can I see what is included in the AppImage?
Execute the binary as follows: `./Electron-Cash*.AppImage --appimage-extract`
Execute the binary as follows: `./Vilight*.AppImage --appimage-extract`
2 changes: 1 addition & 1 deletion contrib/build-linux/appimage/_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ info "Preparing electrum-locale"
for i in ./locale/*; do
dir="$PROJECT_ROOT/lib/$i/LC_MESSAGES"
mkdir -p $dir
msgfmt --output-file="$dir/electron-cash.mo" "$i/electron-cash.po" || true
msgfmt --output-file="$dir/vilight.mo" "$i/vilight.po" || true
done
popd
)
Expand Down
2 changes: 1 addition & 1 deletion contrib/build-linux/appimage/scripts/test-fontconfig.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Electron Cash - lightweight Bitcoin client
# Vilight - lightweight Vitae client
# Copyright (C) 2019 Axel Gembe <derago@gmail.com>
# Copyright (C) 2019 Calin Culianu <calin.culianu@gmail.com>
#
Expand Down
2 changes: 1 addition & 1 deletion contrib/build-linux/appimage/scripts/test-freetype.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Electron Cash - lightweight Bitcoin client
# Vilight - lightweight Vitae client
# Copyright (C) 2019 Axel Gembe <derago@gmail.com>
#
# Permission is hereby granted, free of charge, to any person
Expand Down
8 changes: 4 additions & 4 deletions contrib/build-wine/_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ prepare_wine() {
pushd "$here"
here=`pwd`
# Please update these carefully, some versions won't work under Wine
NSIS_URL='https://github.com/cculianu/Electron-Cash-Build-Tools/releases/download/v1.0/nsis-3.02.1-setup.exe'
NSIS_URL='https://github.com/VitaeTeam/Vilight-Build-Tools/releases/download/v1.0.1/nsis-3.02.1-setup.exe'
NSIS_SHA256=736c9062a02e297e335f82252e648a883171c98e0d5120439f538c81d429552e

LIBUSB_URL='https://github.com/cculianu/Electron-Cash-Build-Tools/releases/download/v1.0/libusb-1.0.21.7z'
LIBUSB_URL='https://github.com/VitaeTeam/Vilight-Build-Tools/releases/download/v1.0.1/libusb-1.0.21.7z'
LIBUSB_SHA256=acdde63a40b1477898aee6153f9d91d1a2e8a5d93f832ca8ab876498f3a6d2b8

PYINSTALLER_REPO='https://github.com/EchterAgo/pyinstaller.git'
Expand Down Expand Up @@ -167,7 +167,7 @@ prepare_wine() {
# if the verification fails you might need to get more keys from python.org
# keys from https://www.python.org/downloads/#pubkeys
info "Importing Python dev keyring (may take a few minutes)..."
KEYRING_PYTHON_DEV=keyring-electroncash-build-python-dev.gpg
KEYRING_PYTHON_DEV=keyring-vilight-build-python-dev.gpg
gpg -v --no-default-keyring --keyring $KEYRING_PYTHON_DEV --import \
"$here"/pgp/7ed10b6531d7c8e1bc296021fc624643487034e5.asc \
|| fail "Failed to import Python release signing keys"
Expand Down Expand Up @@ -274,7 +274,7 @@ build_the_app() {
for i in ./locale/*; do
dir=$i/LC_MESSAGES
mkdir -p $dir
msgfmt --output-file=$dir/electron-cash.mo $i/electron-cash.po || true
msgfmt --output-file=$dir/vilight.mo $i/vilight.po || true
done
popd

Expand Down
6 changes: 3 additions & 3 deletions contrib/build-wine/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if [ $(uname) = "Linux" ]; then
fi

info "Creating docker image ..."
$SUDO docker build -t electroncash-wine-builder-img contrib/build-wine/docker \
$SUDO docker build -t vilight-wine-builder-img contrib/build-wine/docker \
|| fail "Failed to create docker image"

# This is the place where we checkout and put the exact revision we want to work
Expand All @@ -65,11 +65,11 @@ FRESH_CLONE_DIR=$FRESH_CLONE/$GIT_DIR_NAME
# just in case it needs to see it.
$SUDO docker run -it \
-e GIT_REPO="$GIT_REPO" \
--name electroncash-wine-builder-cont \
--name vilight-wine-builder-cont \
-v $FRESH_CLONE_DIR:/opt/wine64/drive_c/vilight \
--rm \
--workdir /opt/wine64/drive_c/vilight/contrib/build-wine \
electroncash-wine-builder-img \
vilight-wine-builder-img \
./_build.sh $REV
) || fail "Build inside docker container failed"

Expand Down
16 changes: 8 additions & 8 deletions contrib/build-wine/deterministic.spec
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ binaries += [('C:/tmp/libzbar-0.dll', '.')]
binaries += [b for b in collect_dynamic_libs('PyQt5') if 'qwindowsvista' in b[0]]

datas = [
(home+'lib/currencies.json', 'electroncash'),
(home+'lib/servers.json', 'electroncash'),
(home+'lib/servers_testnet.json', 'electroncash'),
(home+'lib/wordlist/english.txt', 'electroncash/wordlist'),
(home+'lib/locale', 'electroncash/locale'),
(home+'gui/qt/data/ecsupplemental_win.ttf', 'electroncash_gui/qt/data'),
(home+'plugins', 'electroncash_plugins'),
(home+'lib/currencies.json', 'vilight'),
(home+'lib/servers.json', 'vilight'),
(home+'lib/servers_testnet.json', 'vilight'),
(home+'lib/wordlist/english.txt', 'vilight/wordlist'),
(home+'lib/locale', 'vilight/locale'),
(home+'gui/qt/data/ecsupplemental_win.ttf', 'vilight_gui/qt/data'),
(home+'plugins', 'vilight_plugins'),
]
datas += collect_data_files('trezorlib')
datas += collect_data_files('btchip')
Expand Down Expand Up @@ -171,4 +171,4 @@ coll = COLLECT(
debug=False,
icon=home+'icons/electron.ico',
console=False,
name=os.path.join('dist', 'electroncash'))
name=os.path.join('dist', 'vilight'))
16 changes: 8 additions & 8 deletions contrib/build-wine/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ folder.
2. Build image

```
$ sudo docker build -t electroncash-wine-builder-img contrib/build-wine/docker
$ sudo docker build -t vilight-wine-builder-img contrib/build-wine/docker
```

_Note 1:_ see [this](https://stackoverflow.com/a/40516974/7499128) if having dns problems
Expand All @@ -37,26 +37,26 @@ folder.
rm -rf $FRESH_CLONE && \
mkdir -p $FRESH_CLONE && \
cd $FRESH_CLONE && \
git clone https://github.com/Electron-Cash/Electron-Cash && \
cd Electron-Cash
git clone https://github.com/VitaeTeam/ViLight && \
cd Vilight
```

And then build from this directory:
```
$ REV=4.0.0 # Replace this with whatever Electron Cash revision tag you want to build
$ git checkout $REV
$ sudo docker run -it \
--name electroncash-wine-builder-cont \
-v $PWD:/opt/wine64/drive_c/electroncash \
--name vilight-wine-builder-cont \
-v $PWD:/opt/wine64/drive_c/vilight \
--rm \
--workdir /opt/wine64/drive_c/electroncash/contrib/build-wine \
electroncash-wine-builder-img \
--workdir /opt/wine64/drive_c/vilight/contrib/build-wine \
vilight-wine-builder-img \
./_build.sh $REV
```

_Note:_ If you are on a MacOS host, you should run the above command **without** `sudo`.

4. The generated binaries are in `./contrib/build-wine/dist` (relative to the `fresh_clone/Electron-Cash` directory you should find yourself in if you followed 1-3 above).
4. The generated binaries are in `./contrib/build-wine/dist` (relative to the `fresh_clone/Vilight` directory you should find yourself in if you followed 1-3 above).



Expand Down
2 changes: 1 addition & 1 deletion contrib/build-wine/electron-cash.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Section
Delete "$SMPROGRAMS\${PRODUCT_NAME}\*.*"

;Files to pack into the installer
File /r "dist\electroncash\*.*"
File /r "dist\vilight\*.*"
File "..\..\icons\electron.ico"

;Store installation folder
Expand Down
Loading