Merge #569: Qt port from Liquid-qt

003fb19 QT: Carbon copy 0.14-based transaction accounting (Gregory Sanders)
6333166 QT: get fee directly from elementsmode transactions (Gregory Sanders)
a337b76 QT: Fixup OSX build (Gregory Sanders)
9626907 QT: Disable URI unit tests since unused (Gregory Sanders)
95d0981 QT: Fix QT to work in non-elementsmode (Gregory Sanders)
027aeef QT: Remove ^M and trailing whitespace (Gregory Sanders)
c299dd2 QT: fix qt linter (Gregory Sanders)
8adf591 QT include linting (Gregory Sanders)
ab21387 QT: Always return blinded address (Gregory Sanders)
dbac2af QT: Enter a s/Bitcoin/Liquid/ address (Gregory Sanders)
1dde8a7 Update blech32 checkbox text (Gregory Sanders)
7108ab7 Add unix build notes for Elements-QT dependencies (Gregory Sanders)
967ed83 f'init: If bitcoind is unreachable, explain where the user can get it' (Gregory Sanders)
acf2436 f'GUI: Pre-render amount for transaction notifications so asset is correct' (Gregory Sanders)
d51b9ed f'GUI: Display label rather than address on popups' (Gregory Sanders)
f7f5bb7 f'GUI: Disable Subtract fee from amount' (Gregory Sanders)
084a2fd f'GUI: Make liquidv1 the' (Gregory Sanders)
0aff675 f'GUI: Add liquidv1 network style' (Gregory Sanders)
cbf93b9 Added liquid.conf template (Daniel Olaya)
1a654f4 fix logo position and size on retina displays (Riccardo Casatta)
3241af9 GUI: Adjust recommended number of blocks confirmed to 2 (Luke Dashjr)
3779ae2 Bugfix: GUI: Re-enable Show/Remove buttons on Receive tab (Luke Dashjr)
f963920 GUI: Pre-render amount for transaction notifications so asset is correct (Luke Dashjr)
3bedac4 GUI: Drop "(GUI node for Bitcoin)" from program description (Luke Dashjr)
33f54fb GUI: Remove unnecessary references to Bitcoin (Luke Dashjr)
be7527f GUI: Replace "Bitcoin" with "Liquid" in appropriate strings (Luke Dashjr)
f62c0d3 GUI: Replace "Bitcoin" with "Liquid" in appropriate strings (Luke Dashjr)
737e99a GUI: Make liquidv1 the "normal title bar" style (Luke Dashjr)
d82eee9 GUI: Add liquidv1 network style (Luke Dashjr)
ce752c0 GUI: Remove access to unported "transaction details" display (Luke Dashjr)
0a3f589 init: If bitcoind is unreachable, explain where the user can get it (Luke Dashjr)
6802658 GUI: Adjust blockchain and chainstate sizes in Intro (Luke Dashjr)
d522775 Bugfix: GUI: Ensure negative symbol is before whole number in GUIUtil::formatAssetAmount (Luke Dashjr)
36ebb13 GUI: Disable "Subtract fee from amount" checkbox when a non-pegged asset is selected (Luke Dashjr)
1f0b688 GUI: Emit BitcoinAmountField::valueChanged when unit changes even if the current value is invalid (Luke Dashjr)
954f775 Bugfix: GUI: Receive: Don't try to update label for non-existent Amount column (Luke Dashjr)
bbb5a4c Gitian: Remove libconsensus from Windows/macOS builds (Luke Dashjr)
08aea0e configure: Rename binary to elements name (Gregory Sanders)
795f7f1 Gitian: Use newer librsvg so Liquid logo renders correctly (Luke Dashjr)
4c678d1 GUI: Receive: Eliminate "Copy URI" from receive request dialog (Luke Dashjr)
9ee4629 GUI: Add "L-" prefix to Bitcoin units (Luke Dashjr)
6879be7 GUI: Liquid branding (Luke Dashjr)
3f1764a Generate bitcoin_testnet.ico using ImageMagick (Luke Dashjr)
f60462d Rather than clean generated icons, plan to distribute them (Luke Dashjr)
d389515 Render NSIS wizard sidebar image (Luke Dashjr)
ff6a0a1 Render some icons when possible (Luke Dashjr)
ec8e73a Make a modified copy of qrc file for VPATH builds (Luke Dashjr)
06b30cf Travis: Include dependencies for building icons (Luke Dashjr)
4fa10fe gitian: Dependencies for rendering icons (Luke Dashjr)
3351499 Reuse Windows ICO for Windows installer (Luke Dashjr)
749e0a8 clientversion: Fix CLIENT_NAME to "Elements Core" (Luke Dashjr)
20bf9c5 GUI: Disable coin control (non-functional) (Luke Dashjr)
82dfd3f GUI: Receive: Eliminate URI, and make QR code of just the address (Luke Dashjr)
273aa76 GUI: Receive: Split up long addresses across multiple lines, in QR code image (Luke Dashjr)
25600f9 GUI: Receive: Remove URI-specific parameters for now (Luke Dashjr)
20479e4 GUI: Receive: Replace "Copy URI" with "Copy address" (Luke Dashjr)
d4d45b6 GUI: Use CT address for examples (Luke Dashjr)
0d11cd0 GUI: Transactions: Remove "to yourself" filter, no longer applicable (Luke Dashjr)
66ac3e6 GUI: Move the "Recent Transactions" view below "Balances" (Luke Dashjr)
6ab7bcc Bugfix: GUI: Overview: Fix hiding of immature when balances are zero (Gregory Sanders)
8048a6d QT: have output amounts propagated for subtractfeefromoutput logic (Gregory Sanders)
2a334b7 Slightly smarter change key vector padding (Gregory Sanders)
79e0cb7 GUI: Support for sending assets (Luke Dashjr)
f4d5552 GUI: Clone SendCoinsRecipient to SendAssetsRecipient (Luke Dashjr)
70458f6 Pad change keys for wallet interface pending txs (Gregory Sanders)
466b3d0 CAmountMap::operator! to check if empty (Luke Dashjr)
af726c7 GUI: BitcoinAmountField: Limit issued assets to 21M (Luke Dashjr)
2ebae1a GUI: SendCoinsEntry: Propagate asset types available to amount field (Luke Dashjr)
a163be0 GUI: WalletModel: Track asset type collection (Luke Dashjr)
7f00087 GUI: BitcoinAmountField: Allow changing allowed assets after construction (Luke Dashjr)
3e669cd GUI: BitcoinAmountField: Allow code to set assets not in allowed_assets (Luke Dashjr)
2c75c44 GUI: BitcoinAmountField: Support for non-bitcoin assets (Luke Dashjr)
a1a8848 GUI: GUIUtil::parseAssetAmount abstraction (Luke Dashjr)
881862c bugfix: issuance to self not a debit (Gregory Sanders)
047799c CAsset: GetIdentifier to get label or hex id (Luke Dashjr)
d81c9f7 AmountSpinBox: Resolve singleStep default when making steps (Luke Dashjr)
2953613 GUI: Option to remove asset name for GUIUtil::formatAssetAmount (Luke Dashjr)
85f0ad8 replace bitcoin-qt with elements-qt (Lawrence Nahum)
f027ca0 GUI: Always include bitcoins in formatMultiAssetAmount (Luke Dashjr)
f5fb840 GUI: Overview: Show all assets in balances (Luke Dashjr)
6342d80 GUI: Add GUIUtil::formatMultiAssetAmount to handle a CAmountMap (Luke Dashjr)
988ed5e GUI: Abstract asset+amount formatting into new GUIUtil::formatAssetAmount (Luke Dashjr)
89275eb GUI: TransactionRecord: Special-case the common scenario where assets are simply issued to myself (Luke Dashjr)
906cc4c Wallet: GetIssuanceAssets to get CAmountMap for issuances (Luke Dashjr)
4ea8f88 GUI: TransactionRecord: When time/index/etc match, sort fee, issuance, send, then receive (Luke Dashjr)
51e7897 GUI: TransactionRecord: Add asset issuance record type (Luke Dashjr)
e6b3676 Wallet: GetIssuanceAssets to just get CAssets for issuances (Gregory Sanders)
2bcd243 GUI: Overview: Use formatted amount text from TransactionTableModel (Luke Dashjr)
eef551a GUI: TransactionTableModel: Remove bitcoin unit from Amount column header (Luke Dashjr)
19c87c0 GUI: TransactionTableModel: Include unit name with formatted amount (Luke Dashjr)
a582fe0 GUI: TransactionRecord: Turn non-bitcoin fees into entries (Luke Dashjr)
ef2f717 GUI: TransactionRecord: Add asset field (Gregory Sanders)
060ad2f GUI: TransactionRecord: Collapse credit+debit fields to just amount (Luke Dashjr)
0aeab14 GUI: Ignore explicit fee output when determining if a transaction is send-to-self (Luke Dashjr)
1655947 gui: Alternate row background based on txid (João Barbosa)
3edcdf8 gui: Add transaction record type Fee (João Barbosa)
41c8d4c gui: Avoid TransactionRecord instance for IsMine outputs (João Barbosa)

Pull request description:

  Splash page is always Liquid-themed like before. Pegged asset is assumed to be `L-BTC`. Default network for QT is still `elementsregtest`. Do we want it to be `liquidv1`?

  resolves #528

Tree-SHA512: cd7c07262195c344185f5b7bd779985cf7ee26f0fdf1fa105a4ce93b51cbbd83cc78884e3ed711d884697a48904c2d76647eba76509f6a22210b75f6fcdc13c5

.gitignore

@@ -80,8 +80,8 @@ src/qt/bitcoin-qt.includes
 # Compilation and Qt preprocessor part
 *.qm
 Makefile
-bitcoin-qt
-Bitcoin-Qt.app
+elements-qt
+Elements-Qt.app
 background.tiff*
 
 # Unit-tests

.travis.yml

@@ -25,6 +25,7 @@ env:
     - CCACHE_DIR=$HOME/.ccache
     - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
     - SDK_URL=https://bitcoincore.org/depends-sources/sdks
+    - COMMON_PACKAGES="icnsutils librsvg2-bin imagemagick"
     - WINEDEBUG=fixme-all
     - DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache"
 before_install:

.travis/test_04_install.sh

@@ -22,5 +22,5 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
 fi
 
 travis_retry DOCKER_EXEC apt-get update
-travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES $DOCKER_PACKAGES
+travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $COMMON_PACKAGES $PACKAGES $DOCKER_PACKAGES
 

CONTRIBUTING.md

@@ -78,7 +78,7 @@ the pull request affects. Valid areas as:
 
   - *Consensus* for changes to consensus critical code
   - *Docs* for changes to the documentation
-  - *Qt* for changes to bitcoin-qt
+  - *Qt* for changes to elements-qt
   - *Mining* for changes to the mining code
   - *Net* or *P2P* for changes to the peer-to-peer network code
   - *RPC/REST/ZMQ* for changes to the RPC, REST or ZMQ APIs

Makefile.am

@@ -33,7 +33,7 @@ OSX_BACKGROUND_IMAGE_DPIS=36 72
 OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py
 OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
 OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
-OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
+OSX_INSTALLER_ICONS=src/qt/res/rendered_icons/bitcoin.icns
 OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
 OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
 
@@ -50,9 +50,9 @@ DIST_SHARE = \
 BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
            $(top_srcdir)/contrib/devtools/security-check.py
 
-WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
+WINDOWS_PACKAGING = src/qt/res/rendered_icons/bitcoin.ico \
   $(top_srcdir)/share/pixmaps/nsis-header.bmp \
-  $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
+  src/qt/res/rendered_icons/nsis-wizard.bmp \
   $(top_srcdir)/doc/README_windows.txt
 
 OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
@@ -90,11 +90,14 @@ $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
 	$(MKDIR_P) $(@D)
 	$(INSTALL_DATA) $< $@
 
+src/qt/res/rendered_icons/%: FORCE
+	$(MAKE) -C src $(patsubst src/%,%,$@)
+
 $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
 	$(MKDIR_P) $(@D)
 	$(INSTALL_DATA) $< $@
 
-$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: all-recursive
+$(OSX_APP)/Contents/MacOS/Elements-Qt: all-recursive
 	$(MKDIR_P) $(@D)
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM)  $(BITCOIN_QT_BIN) $@
 
@@ -104,7 +107,7 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
 
 OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
   $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
-  $(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
+  $(OSX_APP)/Contents/MacOS/Elements-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
 
 osx_volname:
 	echo $(OSX_VOLNAME) >$@
@@ -129,7 +132,7 @@ $(APP_DIST_DIR)/Applications:
 	@rm -f $@
 	@cd $(@D); $(LN_S) /Applications $(@F)
 
-$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
+$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Elements-Qt
 
 $(OSX_DMG): $(APP_DIST_EXTRAS)
 	$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist
@@ -144,7 +147,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF
 $(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
 	$(PYTHON) $< "$@" "$(OSX_VOLNAME)"
 
-$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
+$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Elements-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
 	INSTALLNAMETOOL=$(INSTALLNAMETOOL)  OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
 
 deploydir: $(APP_DIST_EXTRAS)

configure.ac

@@ -15,7 +15,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([build-aux/m4])
 
 BITCOIN_DAEMON_NAME=elementsd
-BITCOIN_GUI_NAME=bitcoin-qt
+BITCOIN_GUI_NAME=elements-qt
 BITCOIN_CLI_NAME=elements-cli
 BITCOIN_TX_NAME=elements-tx
 
@@ -418,6 +418,17 @@ AC_ARG_WITH([daemon],
   [build_bitcoind=$withval],
   [build_bitcoind=yes])
 
+can_render_icons=yes
+AC_PATH_PROGS([RSVG_CONVERT],[rsvg-convert rsvg],no)
+AC_PATH_PROGS([IMAGEMAGICK_CONVERT],[convert],no)
+AC_PATH_PROGS([PNG2ICNS],[png2icns],no)
+
+if test x$RSVG_CONVERT = xno; then
+  can_render_icons='rsvg-convert'
+elif test x$IMAGEMAGICK_CONVERT = xno; then
+  can_render_icons='(ImageMagick) convert'
+fi
+
 use_pkgconfig=yes
 case $host in
   *mingw*)
@@ -482,6 +493,10 @@ case $host in
 
      ;;
   *darwin*)
+     if test x$PNG2ICNS = xno; then
+       can_render_icons='png2icns'
+     fi
+
      TARGET_OS=darwin
      LEVELDB_TARGET_FLAGS="-DOS_MACOSX"
      if  test x$cross_compiling != xyes; then
@@ -531,8 +546,6 @@ case $host in
            AC_PATH_TOOL([INSTALLNAMETOOL], [install_name_tool], install_name_tool)
            AC_PATH_TOOL([OTOOL], [otool], otool)
            AC_PATH_PROGS([GENISOIMAGE], [genisoimage mkisofs],genisoimage)
-           AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
-           AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert)
            AC_PATH_PROGS([TIFFCP], [tiffcp],tiffcp)
 
            dnl libtool will try to strip the static lib, which is a problem for
@@ -582,6 +595,8 @@ case $host in
      ;;
 esac
 
+AM_CONDITIONAL([CAN_RENDER_ICONS], [test x$can_render_icons = xyes])
+
 if test x$use_pkgconfig = xyes; then
   m4_ifndef([PKG_PROG_PKG_CONFIG], [AC_MSG_ERROR(PKG_PROG_PKG_CONFIG macro not found. Please install pkg-config and re-run autogen.sh.)])
   m4_ifdef([PKG_PROG_PKG_CONFIG], [

contrib/gitian-descriptors/gitian-linux.yml

@@ -23,6 +23,9 @@ packages:
 - "gcc-8-multilib"
 - "binutils-gold"
 - "git"
+- "icnsutils"
+- "imagemagick"
+- "librsvg2-bin"
 - "pkg-config"
 - "autoconf"
 - "libtool"
@@ -59,6 +62,10 @@ script: |
     mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
   fi
 
+  ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
+  dpkg -x librsvg*.deb new-rsvg
+  export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
+
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}

contrib/gitian-descriptors/gitian-osx.yml

@@ -10,6 +10,7 @@ packages:
 - "curl"
 - "g++"
 - "git"
+- "icnsutils"
 - "pkg-config"
 - "autoconf"
 - "librsvg2-bin"
@@ -54,6 +55,10 @@ script: |
 
   export ZERO_AR_DATE=1
 
+  ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
+  dpkg -x librsvg*.deb new-rsvg
+  export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
+
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
@@ -156,9 +161,6 @@ script: |
     ${WRAP_DIR}/dmg dmg "${OSX_VOLNAME}.dmg" ${OUTDIR}/${DISTNAME}-osx-unsigned.dmg
 
     cd installed
-    find . -name "lib*.la" -delete
-    find . -name "lib*.a" -delete
-    rm -rf ${DISTNAME}/lib/pkgconfig
     find ${DISTNAME} | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
     cd ../../
   done

contrib/gitian-descriptors/gitian-win.yml

@@ -9,6 +9,9 @@ packages:
 - "curl"
 - "g++"
 - "git"
+- "icnsutils"
+- "imagemagick"
+- "librsvg2-bin"
 - "pkg-config"
 - "autoconf"
 - "libtool"
@@ -48,6 +51,10 @@ script: |
     mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
   fi
 
+  ls librsvg*.deb || wget http://mirrors.kernel.org/ubuntu/pool/main/libr/librsvg/librsvg2-2_2.40.13-3_amd64.deb
+  dpkg -x librsvg*.deb new-rsvg
+  export LD_LIBRARY_PATH="$(echo $PWD/new-rsvg/usr/lib/*/)"
+
   function create_global_faketime_wrappers {
   for prog in ${FAKETIME_PROGS}; do
     echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
@@ -159,12 +166,7 @@ script: |
     rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe
     cp -f elements-*setup*.exe $OUTDIR/
     cd installed
-    mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
-    find . -name "lib*.la" -delete
-    find . -name "lib*.a" -delete
-    rm -rf ${DISTNAME}/lib/pkgconfig
     find ${DISTNAME}/bin -type f -executable -exec ${i}-objcopy --only-keep-debug {} {}.dbg \; -exec ${i}-strip -s {} \; -exec ${i}-objcopy --add-gnu-debuglink={}.dbg {} \;
-    find ${DISTNAME}/lib -type f -exec ${i}-objcopy --only-keep-debug {} {}.dbg \; -exec ${i}-strip -s {} \; -exec ${i}-objcopy --add-gnu-debuglink={}.dbg {} \;
     find ${DISTNAME} -not -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}.zip
     find ${DISTNAME} -name "*.dbg"  -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}-debug.zip
     cd ../../

contrib/macdeploy/detached-sig-create.sh

@@ -7,7 +7,7 @@ export LC_ALL=C
 set -e
 
 ROOTDIR=dist
-BUNDLE="${ROOTDIR}/Bitcoin-Qt.app"
+BUNDLE="${ROOTDIR}/Elements-Qt.app"
 CODESIGN=codesign
 TEMPDIR=sign.temp
 TEMPLIST=${TEMPDIR}/signatures.txt

contrib/macdeploy/fancy.plist

@@ -22,7 +22,7 @@
 			<integer>370</integer>
 			<integer>156</integer>
 		</array>
-		<key>Bitcoin-Qt.app</key>
+		<key>Elements-Qt.app</key>
 		<array>
 			<integer>128</integer>
 			<integer>156</integer>

contrib/macdeploy/macdeployqtplus

@@ -154,7 +154,7 @@ class FrameworkInfo(object):
 class ApplicationBundleInfo(object):
     def __init__(self, path):
         self.path = path
-        appName = "Bitcoin-Qt"
+        appName = "Elements-Qt"
         self.binaryPath = os.path.join(path, "Contents", "MacOS", appName)
         if not os.path.exists(self.binaryPath):
             raise RuntimeError("Could not find bundle binary for " + path)
@@ -602,7 +602,7 @@ else:
 
 # ------------------------------------------------
 
-target = os.path.join("dist", "Bitcoin-Qt.app")
+target = os.path.join("dist", "Elements-Qt.app")
 
 if verbose >= 2:
     print("+ Copying source bundle +")

doc/README.md

@@ -16,11 +16,11 @@ The following are some helpful notes on how to run Bitcoin Core on your native p
 Unpack the files into a directory and run:
 
 - `bin/elementsd` (headless)
-- `bin/elements-qt` (GUI) (currently not provided)
+- `bin/elements-qt` (GUI)
 
 ### Windows
 
-Unpack the files into a directory, and then run bitcoin-qt.exe.
+Unpack the files into a directory, and then run elements-qt.exe.
 
 ### macOS
 

doc/README_windows.txt

@@ -1,23 +1,23 @@
-Bitcoin Core
-=============
-
-Intro
------
-Bitcoin is a free open source peer-to-peer electronic cash system that is
-completely decentralized, without the need for a central server or trusted
-parties.  Users hold the crypto keys to their own money and transact directly
-with each other, with the help of a P2P network to check for double-spending.
-
-
-Setup
------
-Unpack the files into a directory and run bitcoin-qt.exe.
-
-Bitcoin Core is the original Bitcoin client and it builds the backbone of the network.
-However, it downloads and stores the entire history of Bitcoin transactions;
-depending on the speed of your computer and network connection, the synchronization
-process can take anywhere from a few hours to a day or more.
-
-See the bitcoin wiki at:
-  https://en.bitcoin.it/wiki/Main_Page
-for more help and information.
+Bitcoin Core
+=============
+
+Intro
+-----
+Bitcoin is a free open source peer-to-peer electronic cash system that is
+completely decentralized, without the need for a central server or trusted
+parties.  Users hold the crypto keys to their own money and transact directly
+with each other, with the help of a P2P network to check for double-spending.
+
+
+Setup
+-----
+Unpack the files into a directory and run elements-qt.exe.
+
+Bitcoin Core is the original Bitcoin client and it builds the backbone of the network.
+However, it downloads and stores the entire history of Bitcoin transactions;
+depending on the speed of your computer and network connection, the synchronization
+process can take anywhere from a few hours to a day or more.
+
+See the bitcoin wiki at:
+  https://en.bitcoin.it/wiki/Main_Page
+for more help and information.

doc/build-unix.md

@@ -24,7 +24,7 @@ make
 make install # optional
 ```
 
-This will build bitcoin-qt as well if the dependencies are met.
+This will build elements-qt as well if the dependencies are met.
 
 Dependencies
 ---------------------
@@ -99,19 +99,21 @@ ZMQ dependencies (provides ZMQ API 4.x):
 
 #### Dependencies for the GUI
 
-If you want to build bitcoin-qt, make sure that the required packages for Qt development
+If you want to build Elements-Qt, make sure that the required packages for Qt development
 are installed. Qt 5 is necessary to build the GUI.
 To build without GUI pass `--without-gui`.
 
 To build with Qt 5 you need the following:
 
-    sudo apt-get install libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler
+    sudo apt-get install libqt5gui5 libqt5core5a libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler imagemagick librsvg2-bin
+
+The last two dependencies are required to generate Elements images that don't exist in Bitcoin Core.
 
 libqrencode (optional) can be installed with:
 
     sudo apt-get install libqrencode-dev
 
-Once these are installed, they will be found by configure and a bitcoin-qt executable will be
+Once these are installed, they will be found by configure and a elements-qt executable will be
 built by default.