Updated name and logos

Author: dondreytaylor

.DS_Store

@@ -1,9 +1,9 @@
 include LICENCE RELEASE-NOTES AUTHORS
 include README.rst
-include electrumg.conf.sample
-include electrumg.desktop
+include electrumbth.conf.sample
+include electrumbth.desktop
 include *.py
-include electrumg
+include electrumbth
 include contrib/requirements/requirements.txt
 include contrib/requirements/requirements-hw.txt
 recursive-include lib *.py

MANIFEST.in

@@ -2,8 +2,8 @@
 
 # Parameterize
 PYTHON_VERSION=3.6.4
-BUILDDIR=/tmp/electrumg-build
-PACKAGE=ElectrumG
+BUILDDIR=/tmp/electrumbth-build
+PACKAGE=ElectrumBTH
 GIT_REPO=https://github.com/BTHPOS/electrum
 
 . $(dirname "$0")/base.sh
@@ -79,4 +79,4 @@ info "pyinstaller --noconfirm --ascii --clean --name $VERSION contrib/build-osx/
 pyinstaller --noconfirm --ascii --clean --name $VERSION contrib/build-osx/osx.spec || fail "Could not build binary"
 
 info "Creating .DMG"
-hdiutil create -fs HFS+ -volname $PACKAGE -srcfolder dist/$PACKAGE.app dist/electrumg-$VERSION.dmg || fail "Could not create .DMG"
+hdiutil create -fs HFS+ -volname $PACKAGE -srcfolder dist/$PACKAGE.app dist/electrumbth-$VERSION.dmg || fail "Could not create .DMG"

contrib/build-osx/make_osx

@@ -5,10 +5,10 @@ from PyInstaller.utils.hooks import collect_data_files, collect_submodules, coll
 import sys
 import os
 
-PACKAGE='ElectrumG'
+PACKAGE='ElectrumBTH'
 PYPKG='electrum'
-MAIN_SCRIPT='electrumg'
-ICONS_FILE='electrumg.icns'
+MAIN_SCRIPT='electrumbth'
+ICONS_FILE='electrumbth.icns'
 
 for i, x in enumerate(sys.argv):
     if x == '--name':

contrib/build-osx/osx.spec

@@ -9,7 +9,7 @@ genisoimage=genisoimage-$cdrkit_version
 
 libdmg_url=https://github.com/theuni/libdmg-hfsplus
 
-tmp_path=/tmp/electrumg-macos
+tmp_path=/tmp/electrumbth-macos
 
 export LD_PRELOAD=$(locate libfaketime.so.1)
 export FAKETIME="2000-01-22 00:00:00"
@@ -18,7 +18,7 @@ export PATH=$PATH:~/bin
 . $(dirname "$0")/base.sh
 
 if [ -z "$1" ]; then
-    echo "Usage: $0 ElectrumG.app"
+    echo "Usage: $0 ElectrumBTH.app"
     exit -127
 fi
 
@@ -74,16 +74,16 @@ ${genisoimage} \
     -D \
     -l \
     -probe \
-    -V "ElectrumG" \
+    -V "ElectrumBTH" \
     -no-pad \
     -r \
     -dir-mode 0755 \
     -apple \
-    -o ElectrumG_uncompressed.dmg \
+    -o ElectrumBTH_uncompressed.dmg \
     ${tmp_path}/image || fail "Unable to create uncompressed dmg"
 
-dmg dmg ElectrumG_uncompressed.dmg electrumg-$VERSION.dmg || fail "Unable to create compressed dmg"
-rm ElectrumG_uncompressed.dmg
+dmg dmg ElectrumBTH_uncompressed.dmg electrumbth-$VERSION.dmg || fail "Unable to create compressed dmg"
+rm ElectrumBTH_uncompressed.dmg
 
 echo "Done."
-md5sum electrumg-$VERSION.dmg
+md5sum electrumbth-$VERSION.dmg

contrib/build-osx/package.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-NAME_ROOT=electrumg
+NAME_ROOT=electrumbth
 PYTHON_VERSION=3.5.4
 
 # These settings probably don't need any change
@@ -49,18 +49,18 @@ echo "Last commit: $VERSION"
 find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
 
-rm -rf $WINEPREFIX/drive_c/electrumg
-cp -r electrum $WINEPREFIX/drive_c/electrumg
+rm -rf $WINEPREFIX/drive_c/electrumbth
+cp -r electrum $WINEPREFIX/drive_c/electrumbth
 cp electrum/LICENCE .
-cp -r electrum-locale/locale $WINEPREFIX/drive_c/electrumg/lib/
-cp electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrumg/gui/qt/
+cp -r electrum-locale/locale $WINEPREFIX/drive_c/electrumbth/lib/
+cp electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrumbth/gui/qt/
 
 # Install frozen dependencies
 $PYTHON -m pip install -r ../../deterministic-build/requirements.txt
 
 $PYTHON -m pip install -r ../../deterministic-build/requirements-hw.txt
 
-pushd $WINEPREFIX/drive_c/electrumg
+pushd $WINEPREFIX/drive_c/electrumbth
 $PYTHON setup.py install
 popd
 
@@ -81,7 +81,7 @@ popd
 wine "$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe" /DPRODUCT_VERSION=$VERSION electrum.nsi
 
 cd dist
-mv electrumg-setup.exe $NAME_ROOT-$VERSION-setup.exe
+mv electrumbth-setup.exe $NAME_ROOT-$VERSION-setup.exe
 cd ..
 
 echo "Done."

contrib/build-wine/build-electrum-git.sh

@@ -13,7 +13,7 @@ else:
 PYTHON_VERSION = '3.5.4'
 PYHOME = 'c:/python' + PYTHON_VERSION
 
-home = 'C:\\electrumg\\'
+home = 'C:\\electrumbth\\'
 
 # see https://github.com/pyinstaller/pyinstaller/issues/2005
 hiddenimports = []
@@ -44,7 +44,7 @@ datas += collect_data_files('btchip')
 datas += collect_data_files('keepkeylib')
 
 # We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
-a = Analysis([home+'electrumg',
+a = Analysis([home+'electrumbth',
               home+'gui/qt/main_window.py',
               home+'gui/text.py',
               home+'lib/util.py',
@@ -86,11 +86,11 @@ exe_standalone = EXE(
     a.scripts,
     a.binaries,
     a.datas, 
-    name=os.path.join('build\\pyi.win32\\electrumg', cmdline_name + ".exe"),
+    name=os.path.join('build\\pyi.win32\\electrumbth', cmdline_name + ".exe"),
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'icons/electrumg.ico',
+    icon=home+'icons/electrumbth.ico',
     console=False)
     # console=True makes an annoying black box pop up, but it does make Electrum output command line commands, with this turned off no output will be given but commands can still be used
 
@@ -99,11 +99,11 @@ exe_portable = EXE(
     a.scripts,
     a.binaries,
     a.datas + [ ('is_portable', 'README.md', 'DATA' ) ],
-    name=os.path.join('build\\pyi.win32\\electrumg', cmdline_name + "-portable.exe"),
+    name=os.path.join('build\\pyi.win32\\electrumbth', cmdline_name + "-portable.exe"),
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'icons/electrumg.ico',
+    icon=home+'icons/electrumbth.ico',
     console=False)
 
 #####
@@ -113,11 +113,11 @@ exe_dependent = EXE(
     pyz,
     a.scripts,
     exclude_binaries=True,
-    name=os.path.join('build\\pyi.win32\\electrumg', cmdline_name),
+    name=os.path.join('build\\pyi.win32\\electrumbth', cmdline_name),
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'icons/electrumg.ico',
+    icon=home+'icons/electrumbth.ico',
     console=False)
 
 coll = COLLECT(
@@ -128,6 +128,6 @@ coll = COLLECT(
     strip=None,
     upx=True,
     debug=False,
-    icon=home+'icons/electrumg.ico',
+    icon=home+'icons/electrumbth.ico',
     console=False,
-    name=os.path.join('dist', 'electrumg'))
+    name=os.path.join('dist', 'electrumbth'))

contrib/build-wine/deterministic.spec

@@ -6,7 +6,7 @@
 ;--------------------------------
 ;Variables
 
-  !define PRODUCT_NAME "ElectrumG"
+  !define PRODUCT_NAME "ElectrumBTH"
   !define PRODUCT_WEB_SITE "https://github.com/BTCGPU/electrum"
   !define PRODUCT_PUBLISHER "Bithereum Organization"
   !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -16,7 +16,7 @@
 
   ;Name and file
   Name "${PRODUCT_NAME}"
-  OutFile "dist/electrumg-setup.exe"
+  OutFile "dist/electrumbth-setup.exe"
 
   ;Default installation folder
   InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
@@ -72,7 +72,7 @@
   !define MUI_ABORTWARNING
   !define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?"
 
-  !define MUI_ICON "tmp\electrum\icons\electrumg.ico"
+  !define MUI_ICON "tmp\electrum\icons\electrumbth.ico"
 
 ;--------------------------------
 ;Pages
@@ -125,7 +125,7 @@ Function .onInit
 FunctionEnd
 
 Function RunApplication
-  ExecShell "" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe"
+  ExecShell "" "$INSTDIR\electrumbth-${PRODUCT_VERSION}.exe"
 FunctionEnd
 
 Section
@@ -138,8 +138,8 @@ Section
   Delete "$SMSTARTUP\${PRODUCT_NAME}.lnk"
 
   ;Files to pack into the installer
-  File /r "dist\electrumg\*.*"
-  File "..\..\icons\electrumg.ico"
+  File /r "dist\electrumbth\*.*"
+  File "..\..\icons\electrumbth.ico"
 
   ;Store installation folder
   WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR
@@ -150,36 +150,36 @@ Section
 
   ;Create desktop shortcut
   DetailPrint "Creating desktop shortcut..."
-  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" ""
+  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrumbth-${PRODUCT_VERSION}.exe" ""
 
   ;Create start-menu items
   DetailPrint "Creating start-menu items..."
   CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
   CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" 0
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" 0
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\electrumbth-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrumbth-${PRODUCT_VERSION}.exe" 0
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrumbth-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrumbth-${PRODUCT_VERSION}.exe" 0
 
-  ;Links bithereumnetwork: URI's to ElectrumG
+  ;Links bithereumnetwork: URI's to ElectrumBTH
   WriteRegStr HKCU "Software\Classes\bithereumnetwork" "" "URL:bithereumnetwork Protocol"
   WriteRegStr HKCU "Software\Classes\bithereumnetwork" "URL Protocol" ""
-  WriteRegStr HKCU "Software\Classes\bithereumnetwork" "DefaultIcon" "$\"$INSTDIR\electrumg.ico, 0$\""
-  WriteRegStr HKCU "Software\Classes\bithereumnetwork\shell\open\command" "" "$\"$INSTDIR\electrumg-${PRODUCT_VERSION}.exe$\" $\"%1$\""
+  WriteRegStr HKCU "Software\Classes\bithereumnetwork" "DefaultIcon" "$\"$INSTDIR\electrumbth.ico, 0$\""
+  WriteRegStr HKCU "Software\Classes\bithereumnetwork\shell\open\command" "" "$\"$INSTDIR\electrumbth-${PRODUCT_VERSION}.exe$\" $\"%1$\""
 
   ;Adds an uninstaller possibility to Windows Uninstall or change a program section
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
-  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\electrumg.ico"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\electrumbth.ico"
 
   ;Fixes Windows broken size estimates
   ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
   IntFmt $0 "0x%08X" $0
   WriteRegDWORD HKCU "${PRODUCT_UNINST_KEY}" "EstimatedSize" "$0"
 
   ${If} ${SectionIsSelected} ${SecStartup}
-    CreateShortCut "$SMSTARTUP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrumg-${PRODUCT_VERSION}.exe" ""
+    CreateShortCut "$SMSTARTUP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrumbth-${PRODUCT_VERSION}.exe" ""
   ${EndIf}
 SectionEnd
 

contrib/build-wine/electrum.nsi

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Run this after a new release to update dependencies
 
-venv_dir=~/.electrumg-venv
+venv_dir=~/.electrumbth-venv
 contrib=$(dirname "$0")
 
 which virtualenv > /dev/null 2>&1 || { echo "Please install virtualenv" && exit 1; }

contrib/freeze_packages.sh

@@ -27,8 +27,8 @@ os.system(cmd)
 
 os.chdir('lib')
 
-crowdin_identifier = 'electrumg'
-crowdin_file_name = 'files[electrumg-client/messages.pot]'
+crowdin_identifier = 'electrumbth'
+crowdin_file_name = 'files[electrumbth-client/messages.pot]'
 locale_file_name = 'locale/messages.pot'
 crowdin_api_key = None
 
@@ -60,7 +60,7 @@ zfobj = zipfile.ZipFile(io.BytesIO(s))
 
 print('Unzip translations')
 for name in zfobj.namelist():
-    if not name.startswith('electrumg-client/locale'):
+    if not name.startswith('electrumbth-client/locale'):
         continue
     if name.endswith('/'):
         if not os.path.exists(name[16:]):