Merge pull request #4042

df9b35e build: prepare v0.18.1.2 (selsta)

.github/qt_helper.py

@@ -0,0 +1,107 @@
+#!/usr/bin/env python3
+import defusedxml.ElementTree
+import hashlib
+import mmap
+import pathlib
+import subprocess
+import sys
+import urllib.parse
+import urllib.request
+import xml.etree.ElementTree as ET
+
+MAX_TRIES = 32
+
+def fetch_links_to_archives(os, target, major, minor, patch, toolchain):
+  MAX_XML_SIZE = 1024 * 1024 * 1024
+  MIRROR = 'download.qt.io'
+  base_url = f'https://{MIRROR}/online/qtsdkrepository/{os}/{target}/qt{major}_{major}{minor}{patch}'
+  url = f'{base_url}/Updates.xml'
+  for _ in range(MAX_TRIES):
+    try:
+      resp = urllib.request.urlopen(url).read(MAX_XML_SIZE)
+      update_xml = defusedxml.ElementTree.fromstring(resp)
+      break
+    except KeyboardInterrupt:
+      raise
+    except BaseException as e:
+      print('error', e, flush=True)
+  else:
+    return
+  for pkg in update_xml.findall('./PackageUpdate'):
+    name = pkg.find('.//Name')
+    if name == None:
+      continue
+    if name.text != f'qt.qt{major}.{major}{minor}{patch}.{toolchain}':
+      continue
+    version = pkg.find('.//Version')
+    if version == None:
+      continue
+    archives = pkg.find('.//DownloadableArchives')
+    if archives == None or archives.text == None:
+      continue
+    for archive in archives.text.split(', '):
+      url = f'{base_url}/{name.text}/{version.text}{archive}'
+      file_name = pathlib.Path(urllib.parse.urlparse(url).path).name
+      yield {'name': file_name, 'url': url}
+
+def download(links):
+  metalink = ET.Element('metalink', xmlns = "urn:ietf:params:xml:ns:metalink")
+  for link in links:
+    file = ET.SubElement(metalink, 'file', name = link['name'])
+    ET.SubElement(file, 'url').text = link['url']
+  data = ET.tostring(metalink, encoding='UTF-8', xml_declaration=True)
+  for _ in range(MAX_TRIES):
+    with subprocess.Popen([
+      'aria2c',
+      '--connect-timeout=8',
+      '--console-log-level=warn',
+      '--continue',
+      '--follow-metalink=mem',
+      '--max-concurrent-downloads=100',
+      '--max-connection-per-server=16',
+      '--max-file-not-found=100',
+      '--max-tries=100',
+      '--min-split-size=1MB',
+      '--retry-wait=1',
+      '--split=100',
+      '--summary-interval=0',
+      '--timeout=8',
+      '--user-agent=',
+      '--metalink-file=-',
+    ], stdin=subprocess.PIPE) as aria:
+      aria.communicate(data)
+      if aria.wait() == 0:
+        return True
+  return False
+
+def calc_hash_sum(files):
+  obj = hashlib.new('sha256')
+  for path in files:
+    with open(path, 'rb') as f:
+      with mmap.mmap(f.fileno(), 0, mmap.MAP_SHARED, mmap.PROT_READ) as m:
+        file_hash = hashlib.new('sha256', m).digest()
+        obj.update(file_hash)
+  return obj.digest().hex()
+
+def extract_archives(files, out='.', targets=[]):
+  for path in files:
+    if subprocess.Popen(['7z', 'x', '-bd', '-y', '-aoa', f'-o{out}', path] + targets,
+      stdout=subprocess.DEVNULL,
+    ).wait() != 0:
+      return False
+  return True
+
+def main():
+  os, target, version, toolchain, expect = sys.argv[1:]
+  major, minor, patch = version.split('.')
+  links = [*fetch_links_to_archives(os, target, major, minor, patch, toolchain)]
+  print(*[l['url'].encode() for l in links], sep='\n', flush=True)
+  assert download(links)
+  result = calc_hash_sum([l['name'] for l in links])
+  print('result', result, 'expect', expect, flush=True)
+  assert result == expect
+  assert extract_archives([l['name'] for l in links], '.', ['{}.{}.{}'.format(major, minor, patch)])
+  [pathlib.Path(l['name']).unlink() for l in links]
+
+if __name__ == '__main__':
+  main()

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: continuous-integration/gh-actions/gui
+name: ci/gh-actions/gui
 
 on: [push, pull_request]
 
@@ -10,7 +10,7 @@ jobs:
       with:
         submodules: recursive
     - name: install dependencies
-      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf qt5 pkg-config
+      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi openssl zmq libpgm libsodium miniupnpc expat libunwind-headers protobuf qt5 pkg-config
     - name: build
       run: DEV_MODE=ON make release -j3
     - name: test qml
@@ -34,7 +34,7 @@ jobs:
     - name: install monero dependencies
       run: sudo apt -y install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev libprotobuf-dev protobuf-compiler
     - name: install monero gui dependencies
-      run: sudo apt -y install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev libgcrypt20-dev xvfb
+      run: sudo apt -y install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtqml-models2 qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-platform qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev libgcrypt20-dev xvfb
     - name: build
       run: DEV_MODE=ON make release -j3
     - name: test qml
@@ -49,31 +49,75 @@ jobs:
     - uses: actions/checkout@v1
       with:
         submodules: recursive
-    - uses: eine/setup-msys2@v1
+    - uses: eine/setup-msys2@v2
       with:
         update: true
-        install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt
+        install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-pcre mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt
     - name: build
       run: DEV_MODE=ON make release-win64 -j2
+    - name: deploy
+      run: make deploy
+      working-directory: build/release
     - name: test qml
       run: build/release/bin/monero-wallet-gui --test-qml
 
+  macos-bundle:
+    runs-on: macOS-latest
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: recursive
+    - name: install dependencies
+      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi openssl zmq libpgm miniupnpc expat libunwind-headers protobuf pkg-config python3 p7zip aria2
+    - name: install dependencies
+      run: pip3 install defusedxml
+    - name: download qt
+      run: python3 monero-gui/.github/qt_helper.py mac_x64 desktop 5.15.2 clang_64 c384008156fe63cc183bade0316828c598ff3e5074397c0c9ccc588d6cdc5aca
+      working-directory: ../
+    - name: build
+      run: CMAKE_PREFIX_PATH=/Users/runner/work/monero-gui/5.15.2/clang_64 make release -j3
+    - name: deploy
+      run: make deploy
+      working-directory: build/release
+    - name: test qml
+      run: build/release/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui --test-qml
+    - name: create .tar
+      run: tar -cf monero-wallet-gui.tar monero-wallet-gui.app
+      working-directory: build/release/bin
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ github.job }}
+        path: build/release/bin/monero-wallet-gui.tar
+
   docker-linux-static:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v1
       with:
         submodules: recursive
-    - uses: satackey/action-docker-layer-caching@v0.0.8
+    - uses: satackey/action-docker-layer-caching@v0.0.11
+      if: "!startsWith(github.ref, 'refs/tags/v')"
       continue-on-error: true
       with:
         key: docker-linux-static-{hash}
         restore-keys: |
           docker-linux-static-
-    - name: preprare build enviroment
+    - name: install dependencies
+      run: sudo apt -y install xvfb libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xkb1 libxcb-shape0 libxkbcommon-x11-0
+    - name: prepare build environment
       run: docker build --tag monero:build-env-linux --build-arg THREADS=3 --file Dockerfile.linux .
     - name: build
       run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'make release-static -j3'
+    - name: sha256sum
+      run: shasum -a256 /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui
+    - name: test qml
+      run: xvfb-run -a /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui --test-qml
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ github.job }}
+        path: |
+          /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui
+          /home/runner/work/monero-gui/monero-gui/build/release/bin/monerod
 
   docker-windows-static:
     runs-on: ubuntu-20.04
@@ -81,13 +125,64 @@ jobs:
     - uses: actions/checkout@v1
       with:
         submodules: recursive
-    - uses: satackey/action-docker-layer-caching@v0.0.8
+    - uses: satackey/action-docker-layer-caching@v0.0.11
+      if: "!startsWith(github.ref, 'refs/tags/v')"
       continue-on-error: true
       with:
         key: docker-windows-static-{hash}
         restore-keys: |
           docker-windows-static-
-    - name: preprare build enviroment
+    - name: prepare build environment
       run: docker build --tag monero:build-env-windows --build-arg THREADS=3 --file Dockerfile.windows .
     - name: build
       run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-windows sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j3'
+    - name: sha256sum
+      run: shasum -a256 /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monero-wallet-gui.exe
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ github.job }}
+        path: |
+          /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monero-wallet-gui.exe
+          /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monerod.exe
+
+  docker-android:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: recursive
+    - uses: satackey/action-docker-layer-caching@v0.0.11
+      if: "!startsWith(github.ref, 'refs/tags/v')"
+      continue-on-error: true
+      with:
+        key: docker-android-static-{hash}
+        restore-keys: |
+          docker-android-static-
+    - name: prepare build environment
+      run: docker build --tag monero:build-env-android --build-arg THREADS=3 --file Dockerfile.android .
+    - name: build
+      run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -e THREADS=3 monero:build-env-android
+    - name: Remove obsolete docker layers
+      run: docker images -a | grep none | awk '{ print $3; }' | xargs docker rmi || true
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ github.job }}
+        path: /home/runner/work/monero-gui/monero-gui/build/Android/release/android-build/monero-gui.apk
+
+  source-archive:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: recursive
+    - name: archive
+      run: |
+        pip install git-archive-all
+        export VERSION="monero-gui-$(git describe)"
+        export OUTPUT="$VERSION.tar"
+        echo "OUTPUT=$OUTPUT" >> $GITHUB_ENV
+        /home/runner/.local/bin/git-archive-all --prefix "$VERSION/" --force-submodules "$OUTPUT"
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ env.OUTPUT }}
+        path: /home/runner/work/monero-gui/monero-gui/${{ env.OUTPUT }}

.gitmodules

@@ -2,3 +2,6 @@
 	path = monero
 	url = https://github.com/monero-project/monero
 	ignore = all
+[submodule "external/quirc"]
+	path = external/quirc
+	url = https://github.com/dlbeer/quirc/

CMakeLists.txt

@@ -1,32 +1,27 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(monero-gui)
 
 message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
-set(VERSION_MAJOR "17")
-set(VERSION_MINOR "0")
-set(VERSION_REVISION "1")
+set(VERSION_MAJOR "18")
+set(VERSION_MINOR "1")
+set(VERSION_REVISION "2")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
 
 option(STATIC "Link libraries statically, requires static Qt")
 
 option(USE_DEVICE_TREZOR "Trezor support compilation" ON)
-option(ENABLE_PASS_STRENGTH_METER "Enable zxcvbn library for password strength" OFF)
 option(WITH_SCANNER "Enable webcam QR scanner" OFF)
+option(WITH_DESKTOP_ENTRY "Ask to install desktop entry on first startup" ON)
+option(WITH_UPDATER "Regularly check for new updates" ON)
 option(DEV_MODE "Checkout latest monero master on build" OFF)
 
 list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake")
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 include(CheckLinkerFlag)
-include(FindCcache)
-
-if(DEBUG)
-	set(CMAKE_VERBOSE_MAKEFILE ON)
-endif()
 
 set(BUILD_GUI_DEPS ON)
-set(ARCH "x86-64" CACHE STRING "Target architecture")
 set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries")
 
 if(NOT MANUAL_SUBMODULES)
@@ -48,8 +43,9 @@ if(NOT MANUAL_SUBMODULES)
     else()
       execute_process(COMMAND ${GIT_EXECUTABLE} fetch WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_FETCH_RESULT)
       execute_process(COMMAND ${GIT_EXECUTABLE} checkout -f origin/master WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_CHECKOUT_MASTER_RESULT)
+      execute_process(COMMAND ${GIT_EXECUTABLE} submodule sync --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_SUBMODULE_SYNC_RESULT)
       execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --force --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_SUBMODULE_UPDATE_RESULT)
-      if(NOT GIT_FETCH_RESULT EQUAL "0" OR NOT GIT_CHECKOUT_MASTER_RESULT EQUAL "0" OR NOT GIT_SUBMODULE_UPDATE_RESULT EQUAL "0")
+      if(NOT GIT_FETCH_RESULT EQUAL "0" OR NOT GIT_CHECKOUT_MASTER_RESULT EQUAL "0" OR NOT GIT_SUBMODULE_SYNC_RESULT EQUAL "0" OR NOT GIT_SUBMODULE_UPDATE_RESULT EQUAL "0")
         message(FATAL_ERROR "Updating git submodule to master (-DDEV_MODE=ON) failed")
       endif()
     endif()
@@ -57,16 +53,13 @@ if(NOT MANUAL_SUBMODULES)
 endif()
 
 add_subdirectory(monero)
+add_subdirectory(external)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set_property(TARGET wallet_merged PROPERTY FOLDER "monero")
 get_directory_property(ARCH_WIDTH DIRECTORY "monero" DEFINITION ARCH_WIDTH)
-get_directory_property(UNBOUND_LIBRARY DIRECTORY "monero" DEFINITION UNBOUND_LIBRARY)
-get_directory_property(DEVICE_TREZOR_READY DIRECTORY "monero" DEFINITION DEVICE_TREZOR_READY)
-get_directory_property(TREZOR_DEP_LIBS DIRECTORY "monero" DEFINITION TREZOR_DEP_LIBS)
 
 if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_definitions(-DQT_NO_DEBUG)
@@ -74,108 +67,41 @@ endif()
 
 if(STATIC)
   message(STATUS "Initiating static build")
-  set(Boost_USE_STATIC_LIBS ON)
-  set(Boost_USE_STATIC_RUNTIME ON)
-  set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+  set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ${CMAKE_FIND_LIBRARY_SUFFIXES})
   add_definitions(-DMONERO_GUI_STATIC)
 endif()
 
-# Include password strength library
-if(ENABLE_PASS_STRENGTH_METER)
-    message(STATUS "Building with pass strength meter support.")
-else()
-    add_definitions(-DDISABLE_PASS_STRENGTH_METER)
-endif()
-
 include(CMakePackageConfigHelpers)
 
-# force version update
-function (monero_gui_add_library_with_deps)
-  cmake_parse_arguments(MONERO_ADD_LIBRARY "" "NAME" "DEPENDS;SOURCES" ${ARGN})
-  source_group("${MONERO_ADD_LIBRARY_NAME}" FILES ${MONERO_ADD_LIBRARY_SOURCES})
-
-  # Define a ("virtual") object library and an actual library that links those
-  # objects together. The virtual libraries can be arbitrarily combined to link
-  # any subset of objects into one library archive. This is used for releasing
-  # libwallet, which combines multiple components.
-  set(objlib obj_${MONERO_ADD_LIBRARY_NAME})
-  add_library(${objlib} OBJECT ${MONERO_ADD_LIBRARY_SOURCES})
-  add_library("${MONERO_ADD_LIBRARY_NAME}" $<TARGET_OBJECTS:${objlib}>)
-  if (MONERO_ADD_LIBRARY_DEPENDS)
-    add_dependencies(${objlib} ${MONERO_ADD_LIBRARY_DEPENDS})
-  endif()
-  set_property(TARGET "${MONERO_ADD_LIBRARY_NAME}" PROPERTY FOLDER "libs")
-  target_compile_definitions(${objlib}
-    PRIVATE $<TARGET_PROPERTY:${MONERO_ADD_LIBRARY_NAME},INTERFACE_COMPILE_DEFINITIONS>)
-endfunction ()
-
-function (monero_gui_add_library name)
-    monero_gui_add_library_with_deps(NAME "${name}" SOURCES ${ARGN})
-endfunction()
-
 include_directories(${EASYLOGGING_INCLUDE})
 link_directories(${EASYLOGGING_LIBRARY_DIRS})
 
-
 include(VersionGui)
-monero_gui_add_library(gui_version SOURCES version.js DEPENDS genversiongui)
 
 message(STATUS "${CMAKE_MODULE_PATH}")
 
-# OpenSSL
-if(APPLE AND NOT OPENSSL_ROOT_DIR)
-  execute_process(COMMAND brew --prefix openssl OUTPUT_VARIABLE OPENSSL_ROOT_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-find_package(OpenSSL REQUIRED)
-message(STATUS "OpenSSL: Version ${OPENSSL_VERSION}")
-message(STATUS "OpenSSL: include dir at ${OPENSSL_INCLUDE_DIR}")
-message(STATUS "OpenSSL: libraries at ${OPENSSL_LIBRARIES} ${OPENSSL_SSL_LIBRARIES}")
-
-# Zbar (for QR scanner)
 if(WITH_SCANNER)
     add_definitions(-DWITH_SCANNER)
-    find_package(ZBar0)
-    message(STATUS "libzbar: include dir at ${ZBAR_INCLUDE_DIR}")
-    message(STATUS "libzbar: libraries at ${ZBAR_LIBRARIES}")
+endif()
+
+if(WITH_DESKTOP_ENTRY)
+    add_definitions(-DWITH_DESKTOP_ENTRY)
+endif()
+
+if(WITH_UPDATER)
+    add_definitions(-DWITH_UPDATER)
 endif()
 
 # Sodium
 find_library(SODIUM_LIBRARY sodium)
 message(STATUS "libsodium: libraries at ${SODIUM_LIBRARY}")
 
-# LibUSB
-find_package(LibUSB)
-message(STATUS "libusb: include dir at ${LibUSB_INCLUDE_DIRS}")
-message(STATUS "libusb: libraries at ${LibUSB_LIBRARIES}")
-
-# HIDApi
-find_package(HIDAPI REQUIRED)
-message(STATUS "libhidapi: include dir at ${HIDAPI_INCLUDE_DIRS}")
-message(STATUS "libhidapi: libraries at ${HIDAPI_LIBRARIES}")
-
-# Boost
-if(DEBUG)
-    set(Boost_DEBUG ON)
-endif()
-if(APPLE AND NOT BOOST_ROOT)
-  execute_process(COMMAND brew --prefix boost OUTPUT_VARIABLE BOOST_ROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-if(MINGW)
-  set(Boost_THREADAPI win32)
-endif()
-find_package(Boost 1.58 REQUIRED COMPONENTS
-		system
-		filesystem
-		thread
-		date_time
-		chrono
-		regex
-		serialization
-		program_options
-		locale)
-
-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE AND NOT ANDROID)
+    set(CMAKE_SKIP_RPATH ON)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES_PREV ${CMAKE_FIND_LIBRARY_SUFFIXES})
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
     find_package(X11 REQUIRED)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_PREV})
     message(STATUS "X11_FOUND = ${X11_FOUND}")
     message(STATUS "X11_INCLUDE_DIR = ${X11_INCLUDE_DIR}")
     message(STATUS "X11_LIBRARIES = ${X11_LIBRARIES}")
@@ -187,25 +113,10 @@ if(UNIX AND NOT APPLE)
     endif()
 endif()
 
-if(MINGW)
-    string(REGEX MATCH "^[^/]:/[^/]*" msys2_install_path "${CMAKE_C_COMPILER}")
-    message(STATUS "MSYS location: ${msys2_install_path}")
-    set(CMAKE_INCLUDE_PATH "${msys2_install_path}/mingw${ARCH_WIDTH}/include")
-    # This is necessary because otherwise CMake will make Boost libraries -lfoo
-    # rather than a full path. Unfortunately, this makes the shared libraries get
-    # linked due to a bug in CMake which misses putting -static flags around the
-    # -lfoo arguments.
-    set(DEFLIB ${msys2_install_path}/mingw${ARCH_WIDTH}/lib)
-    list(REMOVE_ITEM CMAKE_C_IMPLICIT_LINK_DIRECTORIES ${DEFLIB})
-    list(REMOVE_ITEM CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES ${DEFLIB})
-endif()
-
 set(QT5_LIBRARIES
   Qt5Core
   Qt5Quick
-  Qt5Widgets
   Qt5Gui
-  Qt5Network
   Qt5Qml
   Qt5Svg
   Qt5Xml
@@ -217,20 +128,17 @@ endif()
 
 if(APPLE)
   list(APPEND QT5_LIBRARIES Qt5MacExtras)
+endif()
 
+if(UNIX)
   if(NOT CMAKE_PREFIX_PATH AND DEFINED ENV{CMAKE_PREFIX_PATH})
     message(STATUS "Using CMAKE_PREFIX_PATH environment variable: '$ENV{CMAKE_PREFIX_PATH}'")
     set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
   endif()
-  if(NOT CMAKE_PREFIX_PATH)
+  if(APPLE AND NOT CMAKE_PREFIX_PATH)
     execute_process(COMMAND brew --prefix qt5 OUTPUT_VARIABLE QT5_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
     list(APPEND CMAKE_PREFIX_PATH ${QT5_DIR})
   endif()
-
-  if(CMAKE_PREFIX_PATH)
-    include_directories(${CMAKE_PREFIX_PATH}/include)
-    set(CMAKE_BUILD_RPATH "${CMAKE_PREFIX_PATH}/lib")
-  endif()
 endif()
 
 find_package(PkgConfig REQUIRED)
@@ -252,7 +160,22 @@ foreach(QT5_MODULE ${QT5_LIBRARIES})
   include_directories(${${QT5_MODULE}_INCLUDE_DIRS})
 endforeach()
 
-pkg_check_modules(QT5_PKG_CONFIG REQUIRED ${QT5_LIBRARIES})
+if(NOT (CMAKE_CROSSCOMPILING AND ANDROID))
+  pkg_check_modules(QT5_PKG_CONFIG REQUIRED ${QT5_LIBRARIES})
+else()
+  set(QT5_LIBRARIES_ABI)
+  foreach(QT5_MODULE ${QT5_LIBRARIES})
+    list(APPEND QT5_LIBRARIES_ABI "${QT5_MODULE}_${CMAKE_ANDROID_ARCH_ABI}")
+  endforeach()
+  pkg_check_modules(QT5_PKG_CONFIG REQUIRED ${QT5_LIBRARIES_ABI})
+endif()
+
+get_target_property(QMAKE_IMPORTED_LOCATION Qt5::qmake IMPORTED_LOCATION)
+get_filename_component(QT_INSTALL_PREFIX "${QMAKE_IMPORTED_LOCATION}/../.." ABSOLUTE)
+
+if(APPLE AND NOT STATIC)
+  set(CMAKE_BUILD_RPATH "${QT_INSTALL_PREFIX}/lib")
+endif()
 
 if(QT5_PKG_CONFIG_FOUND)
   set(QT5_PKG_CONFIG "QT5_PKG_CONFIG")
@@ -260,15 +183,15 @@ if(QT5_PKG_CONFIG_FOUND)
     set(QT5_PKG_CONFIG "${QT5_PKG_CONFIG}_STATIC")
   endif()
 
-  if(APPLE)
-    list(JOIN ${QT5_PKG_CONFIG}_LDFLAGS_OTHER " " ${QT5_PKG_CONFIG}_LDFLAGS_OTHER)
-    list(JOIN ${QT5_PKG_CONFIG}_LIBRARIES " " ${QT5_PKG_CONFIG}_LIBRARIES)
-    list(JOIN ${QT5_PKG_CONFIG}_INCLUDE_DIRS " " ${QT5_PKG_CONFIG}_INCLUDE_DIRS)
-
+  if(UNIX AND CMAKE_PREFIX_PATH)
+    if(APPLE)
+      list(JOIN ${QT5_PKG_CONFIG}_LDFLAGS_OTHER " " ${QT5_PKG_CONFIG}_LDFLAGS_OTHER)
+    endif()
     # temporal workaround for https://bugreports.qt.io/browse/QTBUG-80922
-    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${CMAKE_PREFIX_PATH}" ${QT5_PKG_CONFIG}_LDFLAGS_OTHER "${${QT5_PKG_CONFIG}_LDFLAGS_OTHER}")
-    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${CMAKE_PREFIX_PATH}" ${QT5_PKG_CONFIG}_LIBRARIES "${${QT5_PKG_CONFIG}_LIBRARIES}")
-    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${CMAKE_PREFIX_PATH}" ${QT5_PKG_CONFIG}_INCLUDE_DIRS "${${QT5_PKG_CONFIG}_INCLUDE_DIRS}")
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_LDFLAGS_OTHER "${${QT5_PKG_CONFIG}_LDFLAGS_OTHER}")
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_LIBRARIES "${${QT5_PKG_CONFIG}_LIBRARIES}")
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_INCLUDE_DIRS "${${QT5_PKG_CONFIG}_INCLUDE_DIRS}")
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_LIBRARY_DIRS "${${QT5_PKG_CONFIG}_LIBRARY_DIRS}")
   endif()
 
   set(QT5_LIBRARIES ${${QT5_PKG_CONFIG}_LIBRARIES} ${${QT5_PKG_CONFIG}_LDFLAGS_OTHER})
@@ -286,9 +209,12 @@ list(APPEND QT5_LIBRARIES
 if(STATIC)
   set(QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/Qt/labs/folderlistmodel)
   list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/Qt/labs/settings)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/Qt/labs/platform)
   list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtGraphicalEffects)
   list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtGraphicalEffects/private)
   list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtMultimedia)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQml)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQml/Models.2)
   list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick.2)
   list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Controls)
   list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Controls.2)
@@ -309,14 +235,16 @@ if(STATIC)
     dialogsprivateplugin
     qmlfolderlistmodelplugin
     qmlsettingsplugin
+    qtlabsplatformplugin
     qmlxmllistmodelplugin
     qquicklayoutsplugin
+    modelsplugin
   )
 
   if(WITH_SCANNER)
     list(APPEND QT5_EXTRA_LIBRARIES_LIST
       declarative_multimedia
-      Qt5MultimediaQuick_p
+      Qt5MultimediaQuick
     )
   endif()
 
@@ -329,6 +257,10 @@ if(STATIC)
     windowplugin
   )
 
+  if(NOT ${Qt5Core_VERSION} VERSION_LESS 5.14)
+     list(APPEND QT5_EXTRA_LIBRARIES_LIST qmlplugin)
+  endif()
+
   set(QT5_EXTRA_LIBRARIES)
   foreach(LIBRARY ${QT5_EXTRA_LIBRARIES_LIST})
     find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS ${QT5_EXTRA_PATHS} REQUIRED)
@@ -356,7 +288,6 @@ if(STATIC)
   if(UNIX AND NOT APPLE)
     list(APPEND QT5_INTEGRATION_LIBRARIES_LIST
       Qt5XcbQpa
-      xcb-static
       Qt5ServiceSupport
       Qt5GlxSupport
     )
@@ -370,15 +301,30 @@ if(STATIC)
   endforeach()
 
   if(UNIX AND NOT APPLE)
-    pkg_check_modules(X11XCB_XCBGLX_FONTCONFIG REQUIRED x11-xcb xcb-glx fontconfig)
-    list(APPEND QT5_LIBRARIES ${X11XCB_XCBGLX_FONTCONFIG_STATIC_LIBRARIES})
+    pkg_check_modules(X11XCB_XCBGLX REQUIRED x11-xcb xcb-glx)
+    list(APPEND QT5_LIBRARIES ${X11XCB_XCBGLX_LIBRARIES})
+    pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
+    list(APPEND QT5_LIBRARIES ${FONTCONFIG_STATIC_LIBRARIES})
   endif()
 endif()
 
-message(STATUS "Using Boost include dir at ${Boost_INCLUDE_DIRS}")
-message(STATUS "Using Boost libraries at ${Boost_LIBRARIES}")
+if(ANDROID)
+  set(QT5_EXTRA_LIBRARIES_LIST
+    GLESv2
+    log
+    z
+    jnigraphics
+    android
+    EGL
+    Qt5VirtualKeyboard_${CMAKE_ANDROID_ARCH_ABI}
+    c++_shared
+  )
+  foreach(LIBRARY ${QT5_EXTRA_LIBRARIES_LIST})
+    find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS "${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/${ANDROID_PLATFORM_LEVEL}" REQUIRED)
+    list(APPEND QT5_LIBRARIES ${${LIBRARY}_LIBRARY})
+  endforeach()
+endif()
 
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 if(MINGW)
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
   set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt)
@@ -406,14 +352,11 @@ endif()
 list(APPEND EXTRA_LIBRARIES ${CMAKE_DL_LIBS})
 
 if(APPLE)
-  include_directories(SYSTEM /usr/include/malloc)
-  if(POLICY CMP0042)
-    cmake_policy(SET CMP0042 NEW)
-  endif()
+  cmake_policy(SET CMP0042 NEW)
 endif()
 
 if (APPLE AND NOT IOS)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -fvisibility=default -std=c++11")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -std=c++11")
 endif()
 
 if(APPLE)
@@ -421,8 +364,6 @@ if(APPLE)
 endif()
 
 # warnings
-add_c_flag_if_supported(-Werror C_SECURITY_FLAGS)
-add_cxx_flag_if_supported(-Werror CXX_SECURITY_FLAGS)
 add_c_flag_if_supported(-Wformat C_SECURITY_FLAGS)
 add_cxx_flag_if_supported(-Wformat CXX_SECURITY_FLAGS)
 add_c_flag_if_supported(-Wformat-security C_SECURITY_FLAGS)
@@ -441,7 +382,7 @@ if (NOT OPENBSD AND NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE
   add_c_flag_if_supported(-fcf-protection=full C_SECURITY_FLAGS)
   add_cxx_flag_if_supported(-fcf-protection=full CXX_SECURITY_FLAGS)
 endif()
-if (NOT WIN32 AND NOT OPENBSD)
+if (NOT WIN32 AND NOT OPENBSD AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   add_c_flag_if_supported(-fstack-clash-protection C_SECURITY_FLAGS)
   add_cxx_flag_if_supported(-fstack-clash-protection CXX_SECURITY_FLAGS)
 endif()
@@ -504,26 +445,5 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
 
-if (HIDAPI_FOUND OR LibUSB_COMPILE_TEST_PASSED)
-  if (APPLE)
-    if(DEPENDS)
-      list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework IOKit")
-    else()
-      find_library(COREFOUNDATION CoreFoundation)
-      find_library(IOKIT IOKit)
-      list(APPEND EXTRA_LIBRARIES ${IOKIT})
-      list(APPEND EXTRA_LIBRARIES ${COREFOUNDATION})
-    endif()
-  endif()
-  if (WIN32)
-    find_library(VERSION_LIBRARY version PATHS /usr/x86_64-w64-mingw32/lib)
-    if(VERSION_LIBRARY STREQUAL "VERSION_LIBRARY-NOTFOUND")
-      set(VERSION_LIBRARY Version)
-    endif()
-    list(APPEND EXTRA_LIBRARIES setupapi ${VERSION_LIBRARY})
-  endif()
-endif()
-
 add_subdirectory(translations)
-
 add_subdirectory(src)

DEPLOY.md

@@ -2,19 +2,22 @@
 
 Use macOS 10.12 - 10.13 for better backwards compability.
 
-1. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install boost zmq libpgm miniupnpc libsodium expat libunwind-headers protobuf libgcrypt`
+1. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install boost zmq libpgm miniupnpc libsodium expat libunwind-headers protobuf libgcrypt hidapi`
 
-2. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install --HEAD hidapi`
+2. Get the latest LTS from here: https://www.qt.io/offline-installers and install
 
-3. Get the latest LTS from here: https://www.qt.io/offline-installers and install
+3. `git clone --recursive -b v0.X.Y.Z --depth 1 https://github.com/monero-project/monero-gui` 
 
-4. `git clone --recursive -b v0.X.Y.Z --depth 1 https://github.com/monero-project/monero-gui` 
+4. Compile `monero-wallet-gui.app`
 
-5. `CMAKE_PREFIX_PATH=~/Qt5.12.8/5.12.8/clang_64 make release`
+```
+mkdir build && cd build
+cmake -D CMAKE_BUILD_TYPE=Release -D ARCH=default -D CMAKE_PREFIX_PATH=~/Qt5.12.8/5.12.8/clang_64 ..
+make
+make deploy
+```
 
-6. `cd build/release && make deploy`
-
-7. Replace the `monerod` binary inside `monero-wallet-gui.app/Contents/MacOS/` with one built using deterministic builds / gitian.
+5. Replace the `monerod` binary inside `monero-wallet-gui.app/Contents/MacOS/` with one built using deterministic builds / gitian.
 
 ## Codesigning and notarizing
 

Dockerfile.android

@@ -0,0 +1,231 @@
+FROM debian:buster
+
+ARG THREADS=1
+ARG ANDROID_NDK_REVISION=21e
+ARG ANDROID_NDK_HASH=c3ebc83c96a4d7f539bd72c241b2be9dcd29bda9
+ARG ANDROID_SDK_REVISION=7302050_latest
+ARG ANDROID_SDK_HASH=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622
+ARG QT_VERSION=v5.15.6-lts-lgpl
+
+WORKDIR /opt/android
+ENV WORKDIR=/opt/android
+
+ENV ANDROID_NATIVE_API_LEVEL=29
+ENV ANDROID_API=android-${ANDROID_NATIVE_API_LEVEL}
+ENV ANDROID_CLANG=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang
+ENV ANDROID_CLANGPP=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang++
+ENV ANDROID_NDK_ROOT=${WORKDIR}/android-ndk-r${ANDROID_NDK_REVISION}
+ENV ANDROID_SDK_ROOT=${WORKDIR}/cmdline-tools
+ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+ENV PATH=${JAVA_HOME}/bin:${PATH}
+ENV PREFIX=${WORKDIR}/prefix
+ENV TOOLCHAIN_DIR=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
+
+RUN apt-get update \
+    && apt-get install -y ant automake build-essential ca-certificates-java file gettext git libc6 libncurses5 \
+    libssl-dev libstdc++6 libtinfo5 libtool libz1 openjdk-11-jdk-headless openjdk-11-jre-headless pkg-config python3 \
+    unzip wget
+
+RUN PACKAGE_NAME=commandlinetools-linux-${ANDROID_SDK_REVISION}.zip \
+    && wget -q https://dl.google.com/android/repository/${PACKAGE_NAME} \
+    && echo "${ANDROID_SDK_HASH}  ${PACKAGE_NAME}" | sha256sum -c \
+    && unzip -q ${PACKAGE_NAME} \
+    && rm -f ${PACKAGE_NAME}
+
+RUN PACKAGE_NAME=android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip \
+    && wget -q https://dl.google.com/android/repository/${PACKAGE_NAME} \
+    && echo "${ANDROID_NDK_HASH}  ${PACKAGE_NAME}" | sha1sum -c \
+    && unzip -q ${PACKAGE_NAME} \
+    && rm -f ${PACKAGE_NAME}
+
+RUN echo y | ${ANDROID_SDK_ROOT}/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} "build-tools;28.0.3" "platforms;${ANDROID_API}" "tools" > /dev/null
+
+ENV HOST_PATH=${PATH}
+ENV PATH=${TOOLCHAIN_DIR}/aarch64-linux-android/bin:${TOOLCHAIN_DIR}/bin:${PATH}
+
+ARG ZLIB_VERSION=1.2.12
+ARG ZLIB_HASH=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
+RUN wget -q https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
+    && echo "${ZLIB_HASH}  zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \
+    && tar -xzf zlib-${ZLIB_VERSION}.tar.gz \
+    && rm zlib-${ZLIB_VERSION}.tar.gz \
+    && cd zlib-${ZLIB_VERSION} \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --static \
+    && make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 \
+    && cd qt5 \
+    && perl init-repository --module-subset=default,-qtwebengine \
+    && PATH=${HOST_PATH} ./configure -v -developer-build -release \
+    -xplatform android-clang \
+    -android-ndk-platform ${ANDROID_API} \
+    -android-ndk ${ANDROID_NDK_ROOT} \
+    -android-sdk ${ANDROID_SDK_ROOT} \
+    -android-ndk-host linux-x86_64 \
+    -no-dbus \
+    -opengl es2 \
+    -no-use-gold-linker \
+    -no-sql-mysql \
+    -opensource -confirm-license \
+    -android-arch arm64-v8a \
+    -prefix ${PREFIX} \
+    -nomake tools -nomake tests -nomake examples \
+    -skip qtwebengine \
+    -skip qtserialport \
+    -skip qtconnectivity \
+    -skip qttranslations \
+    -skip qtpurchasing \
+    -skip qtgamepad -skip qtscript -skip qtdoc \
+    -no-warnings-are-errors \
+    && PATH=${HOST_PATH} make -j${THREADS} \
+    && PATH=${HOST_PATH} make -j${THREADS} install \
+    && cd qttools/src/linguist/lrelease \
+    && ../../../../qtbase/bin/qmake \
+    && PATH=${HOST_PATH} make -j${THREADS} install \
+    && cd ../../../.. \
+    && rm -rf $(pwd)
+
+ARG ICONV_VERSION=1.16
+ARG ICONV_HASH=e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
+RUN wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz \
+    && echo "${ICONV_HASH}  libiconv-${ICONV_VERSION}.tar.gz" | sha256sum -c \
+    && tar -xzf libiconv-${ICONV_VERSION}.tar.gz \
+    && rm -f libiconv-${ICONV_VERSION}.tar.gz \
+    && cd libiconv-${ICONV_VERSION} \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --build=x86_64-linux-gnu --host=aarch64 --prefix=${PREFIX} --disable-rpath \
+    && make -j${THREADS} \
+    && make -j${THREADS} install
+
+ARG BOOST_VERSION=1_74_0
+ARG BOOST_VERSION_DOT=1.74.0
+ARG BOOST_HASH=83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1
+RUN wget -q https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
+    && echo "${BOOST_HASH}  boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
+    && tar -xf boost_${BOOST_VERSION}.tar.bz2 \
+    && rm -f boost_${BOOST_VERSION}.tar.bz2 \
+    && cd boost_${BOOST_VERSION} \
+    && PATH=${HOST_PATH} ./bootstrap.sh --prefix=${PREFIX} \
+    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} ./b2 --build-type=minimal link=static runtime-link=static \
+    --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization \
+    --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi \
+    threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} \
+    cflags='--target=aarch64-linux-android' \
+    cxxflags='--target=aarch64-linux-android' \
+    linkflags='--target=aarch64-linux-android --sysroot=${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm64 ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so -nostdlib++' \
+    install -j${THREADS} \
+    && rm -rf $(pwd)
+
+ARG OPENSSL_VERSION=1.1.1q
+ARG OPENSSL_HASH=d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca
+RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
+    && echo "${OPENSSL_HASH}  openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c \
+    && tar -xzf openssl-${OPENSSL_VERSION}.tar.gz \
+    && rm openssl-${OPENSSL_VERSION}.tar.gz \
+    && cd openssl-${OPENSSL_VERSION} \
+    && ANDROID_NDK_HOME=${ANDROID_NDK_ROOT} ./Configure CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} \
+    android-arm64 no-asm no-shared --static \
+    --with-zlib-include=${PREFIX}/include --with-zlib-lib=${PREFIX}/lib \
+    --prefix=${PREFIX} --openssldir=${PREFIX} \
+    && sed -i 's/CNF_EX_LIBS=-ldl -pthread//g;s/BIN_CFLAGS=-pie $(CNF_CFLAGS) $(CFLAGS)//g' Makefile \
+    && ANDROID_NDK_HOME=${ANDROID_NDK_ROOT} make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+ARG EXPAT_VERSION=2.4.1
+ARG EXPAT_HASH=2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40
+RUN wget https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-${EXPAT_VERSION}.tar.bz2 && \
+    echo "${EXPAT_HASH}  expat-${EXPAT_VERSION}.tar.bz2" | sha256sum -c && \
+    tar -xf expat-${EXPAT_VERSION}.tar.bz2 && \
+    rm expat-${EXPAT_VERSION}.tar.bz2 && \
+    cd expat-${EXPAT_VERSION} && \
+    CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --enable-static --disable-shared --prefix=${PREFIX} --host=aarch64-linux-android && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+ARG UNBOUND_VERSION=1.16.2
+ARG UNBOUND_HASH=2e32f283820c24c51ca1dd8afecfdb747c7385a137abe865c99db4b257403581
+RUN wget https://www.nlnetlabs.nl/downloads/unbound/unbound-${UNBOUND_VERSION}.tar.gz && \
+    echo "${UNBOUND_HASH}  unbound-${UNBOUND_VERSION}.tar.gz" | sha256sum -c && \
+    tar -xzf unbound-${UNBOUND_VERSION}.tar.gz && \
+    rm unbound-${UNBOUND_VERSION}.tar.gz && \
+    cd unbound-${UNBOUND_VERSION} && \
+    CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --disable-shared --enable-static --without-pyunbound --with-libexpat=${PREFIX} --with-ssl=${PREFIX} --with-libevent=no --without-pythonmodule --disable-flto --with-pthreads --with-libunbound-only --host=aarch64-linux-android --with-pic --prefix=${PREFIX} && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+ARG ZMQ_VERSION=v4.3.4
+ARG ZMQ_HASH=4097855ddaaa65ed7b5e8cb86d143842a594eebd
+RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} --depth 1 \
+    && cd libzmq \
+    && git checkout ${ZMQ_HASH} \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --host=aarch64-linux-android \
+    --enable-static --disable-shared \
+    && make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+ARG SODIUM_VERSION=1.0.18
+ARG SODIUM_HASH=4f5e89fa84ce1d178a6765b8b46f2b6f91216677
+RUN set -ex \
+    && git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} --depth 1 \
+    && cd libsodium \
+    && test `git rev-parse HEAD` = ${SODIUM_HASH} || exit 1 \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --host=aarch64-linux-android --enable-static --disable-shared \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN git clone -b libgpg-error-1.41 --depth 1 git://git.gnupg.org/libgpg-error.git \
+    && cd libgpg-error \
+    && git reset --hard 98032624ae89a67ee6fe3b1db5d95032e681d163 \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --host=aarch64-linux-android --prefix=${PREFIX} --disable-rpath --disable-shared --enable-static --disable-doc --disable-tests \
+    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN git clone -b libgcrypt-1.10.1 --depth 1 git://git.gnupg.org/libgcrypt.git \
+    && cd libgcrypt \
+    && git reset --hard ae0e567820c37f9640440b3cff77d7c185aa6742 \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --host=aarch64-linux-android --prefix=${PREFIX} --with-gpg-error-prefix=${PREFIX} --disable-shared --enable-static --disable-doc --disable-tests \
+    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN git clone -b v3.24.2 --depth 1 https://github.com/Kitware/CMake \
+    && cd CMake \
+    && git reset --hard 31f835410efeea50acd43512eb9e5646a26ea177 \
+    && PATH=${HOST_PATH} ./bootstrap \
+    && PATH=${HOST_PATH} make -j${THREADS} \
+    && PATH=${HOST_PATH} make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+CMD set -ex \
+    && cd /monero-gui \
+    && mkdir -p build/Android/release \
+    && cd build/Android/release \
+    && cmake \
+    -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake" \
+    -DCMAKE_PREFIX_PATH="${PREFIX}" \
+    -DCMAKE_FIND_ROOT_PATH="${PREFIX}" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DARCH="armv8-a" \
+    -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} \
+    -DANDROID_ABI="arm64-v8a" \
+    -DANDROID_TOOLCHAIN=clang \
+    -DBoost_USE_STATIC_RUNTIME=ON \
+    -DLRELEASE_PATH="${PREFIX}/bin" \
+    -DQT_ANDROID_APPLICATION_BINARY="monero-wallet-gui" \
+    -DANDROID_SDK="${ANDROID_SDK_ROOT}" \
+    -DWITH_SCANNER=ON \
+    -DWITH_DESKTOP_ENTRY=OFF \
+    ../../.. \
+    && PATH=${HOST_PATH} make generate_translations_header \
+    && make -j${THREADS} -C src \
+    && make -j${THREADS} apk

Dockerfile.linux

@@ -1,14 +1,22 @@
 FROM ubuntu:16.04
 
 ARG THREADS=1
+ARG QT_VERSION=v5.15.6-lts-lgpl
 
-RUN apt update
+ENV CFLAGS="-fPIC"
+ENV CPPFLAGS="-fPIC"
+ENV CXXFLAGS="-fPIC"
+ENV SOURCE_DATE_EPOCH=1397818193
 
-RUN apt install -y automake git pkg-config python xutils-dev && \
-    git clone -b xorgproto-2020.1 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xorgproto && \
+RUN apt update && \
+    apt install -y automake autopoint bison gettext git gperf libgl1-mesa-dev libglib2.0-dev \
+    libpng12-dev libpthread-stubs0-dev libsodium-dev libtool-bin libudev-dev libusb-1.0-0-dev mesa-common-dev \
+    pkg-config python wget xutils-dev
+
+RUN git clone -b xorgproto-2020.1 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xorgproto && \
     cd xorgproto && \
     git reset --hard c62e8203402cafafa5ba0357b6d1c019156c9f36 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
@@ -16,25 +24,91 @@ RUN apt install -y automake git pkg-config python xutils-dev && \
 RUN git clone -b 1.12 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xcbproto && \
     cd xcbproto && \
     git reset --hard 6398e42131eedddde0d98759067dde933191f049 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN apt install -y libtool-bin && \
-    git clone -b libXau-1.0.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxau && \
+RUN git clone -b libXau-1.0.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxau && \
     cd libxau && \
     git reset --hard d9443b2c57b512cfb250b35707378654d86c7dea && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh --enable-shared --disable-static && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN apt install -y libpthread-stubs0-dev && \
-    git clone -b 1.12 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb && \
+RUN git clone -b 1.12 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb && \
     cd libxcb && \
     git reset --hard d34785a34f28fa6a00f8ce00d87e3132ff0f6467 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    make -j$THREADS clean && \
+    rm /usr/local/lib/libxcb-xinerama.so && \
+    ./autogen.sh --disable-shared --enable-static && \
+    make -j$THREADS && \
+    cp src/.libs/libxcb-xinerama.a /usr/local/lib/ && \
+    rm -rf $(pwd)
+
+RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-util && \
+    cd libxcb-util && \
+    git reset --hard acf790d7752f36e450d476ad79807d4012ec863b && \
+    git submodule init && \
+    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git -C m4 reset --hard c617eee22ae5c285e79e81ec39ce96862fd3262f && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-image && \
+    cd libxcb-image && \
+    git reset --hard d882052fb2ce439c6483fce944ba8f16f7294639 && \
+    git submodule init && \
+    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git -C m4 reset --hard c617eee22ae5c285e79e81ec39ce96862fd3262f && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms && \
+    cd libxcb-keysyms && \
+    git reset --hard 0e51ee5570a6a80bdf98770b975dfe8a57f4eeb1 && \
+    git submodule init && \
+    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git -C m4 reset --hard c617eee22ae5c285e79e81ec39ce96862fd3262f && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b 0.3.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util && \
+    cd libxcb-render-util && \
+    git reset --hard 0317caf63de532fd7a0493ed6afa871a67253747 && \
+    git submodule init && \
+    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git -C m4 reset --hard c617eee22ae5c285e79e81ec39ce96862fd3262f && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b 0.4.1 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-wm && \
+    cd libxcb-wm && \
+    git reset --hard 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2 && \
+    git submodule init && \
+    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git -C m4 reset --hard c617eee22ae5c285e79e81ec39ce96862fd3262f && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b xkbcommon-0.5.0 --depth 1 https://github.com/xkbcommon/libxkbcommon && \
+    cd libxkbcommon && \
+    git reset --hard c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 && \
+    ./autogen.sh --prefix=/usr --enable-shared --disable-static --enable-x11 --disable-docs && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
@@ -42,16 +116,16 @@ RUN apt install -y libpthread-stubs0-dev && \
 RUN git clone -b v1.2.11 --depth 1 https://github.com/madler/zlib && \
     cd zlib && \
     git reset --hard cacf7f1d4e3d44d871b605da3b647f07d718623f && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --static && \
+    ./configure --static && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN git clone -b VER-2-10-2 --depth 1 https://git.sv.nongnu.org/r/freetype/freetype2.git && \
+RUN git clone -b VER-2-10-2 --depth 1 https://git.savannah.gnu.org/git/freetype/freetype2.git && \
     cd freetype2 && \
     git reset --hard 132f19b779828b194b3fede187cee719785db4d8 && \
     ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --with-zlib=no && \
+    ./configure --disable-shared --enable-static --with-zlib=no && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
@@ -60,16 +134,15 @@ RUN git clone -b R_2_2_9 --depth 1 https://github.com/libexpat/libexpat && \
     cd libexpat/expat && \
     git reset --hard a7bc26b69768f7fb24f0c7976fae24b157b85b13 && \
     ./buildconf.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static && \
+    ./configure --disable-shared --enable-static && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN apt install -y autopoint gettext gperf libpng12-dev && \
-    git clone -b 2.13.92 --depth 1 https://gitlab.freedesktop.org/fontconfig/fontconfig && \
+RUN git clone -b 2.13.92 --depth 1 https://gitlab.freedesktop.org/fontconfig/fontconfig && \
     cd fontconfig && \
     git reset --hard b1df1101a643ae16cdfa1d83b939de2497b1bf27 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static --sysconfdir=/etc --localstatedir=/var && \
+    ./autogen.sh --disable-shared --enable-static --sysconfdir=/etc --localstatedir=/var && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
@@ -77,46 +150,74 @@ RUN apt install -y autopoint gettext gperf libpng12-dev && \
 RUN git clone -b release-64-2 --depth 1 https://github.com/unicode-org/icu && \
     cd icu/icu4c/source && \
     git reset --hard e2d85306162d3a0691b070b4f0a73e4012433444 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-tests --disable-samples && \
+    ./configure --disable-shared --enable-static --disable-tests --disable-samples && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN apt install -y wget && \
-    wget https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz && \
-    echo "9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf boost_1_73_0.tar.gz" > hashsum.txt && \
-    sha256sum -c hashsum.txt && \
-    tar -xzf boost_1_73_0.tar.gz && \
-    rm boost_1_73_0.tar.gz && \
-    cd boost_1_73_0 && \
+RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz && \
+    echo "4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847 boost_1_80_0.tar.gz" | sha256sum -c && \
+    tar -xzf boost_1_80_0.tar.gz && \
+    rm boost_1_80_0.tar.gz && \
+    cd boost_1_80_0 && \
     ./bootstrap.sh && \
-    ./b2 --with-atomic --with-system --with-filesystem --with-thread --with-date_time --with-chrono --with-regex --with-serialization --with-program_options --with-locale variant=release link=static runtime-link=static cflags='-fPIC' cxxflags='-fPIC' install -a --prefix=/usr && \
+    ./b2 --with-atomic --with-system --with-filesystem --with-thread --with-date_time --with-chrono --with-regex --with-serialization --with-program_options --with-locale variant=release link=static runtime-link=static cflags="${CFLAGS}" cxxflags="${CXXFLAGS}" install -a --prefix=/usr && \
     rm -rf $(pwd)
 
-RUN wget https://www.openssl.org/source/openssl-1.1.1g.tar.gz && \
-    echo "ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 openssl-1.1.1g.tar.gz" > hashsum.txt && \
-    sha256sum -c hashsum.txt && \
-    tar -xzf openssl-1.1.1g.tar.gz && \
-    rm openssl-1.1.1g.tar.gz && \
-    cd openssl-1.1.1g && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./config no-asm no-shared no-zlib-dynamic --openssldir=/usr && \
+RUN wget https://www.openssl.org/source/openssl-1.1.1q.tar.gz && \
+    echo "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca openssl-1.1.1q.tar.gz" | sha256sum -c && \
+    tar -xzf openssl-1.1.1q.tar.gz && \
+    rm openssl-1.1.1q.tar.gz && \
+    cd openssl-1.1.1q && \
+    ./config no-asm no-shared no-zlib-dynamic --prefix=/usr --openssldir=/usr && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN apt install -y libgl1-mesa-dev libglib2.0-dev libxkbcommon-dev && \
-    wget https://download.qt.io/archive/qt/5.9/5.9.9/single/qt-everywhere-opensource-src-5.9.9.tar.xz && \
-    echo "5ce285209290a157d7f42ec8eb22bf3f1d76f2e03a95fc0b99b553391be01642 qt-everywhere-opensource-src-5.9.9.tar.xz"  > hashsum.txt && \
-    sha256sum -c hashsum.txt && \
-    tar -xf qt-everywhere-opensource-src-5.9.9.tar.xz && \
-    rm qt-everywhere-opensource-src-5.9.9.tar.xz && \
-    cd qt-everywhere-opensource-src-5.9.9 && \
+RUN wget https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.bz2 && \
+    echo "a247a7f6bbb21cf2ca81ea4cbb916bfb9717ca523631675f99b3d4a5678dcd16 expat-2.4.8.tar.bz2" | sha256sum -c && \
+    tar -xf expat-2.4.8.tar.bz2 && \
+    rm expat-2.4.8.tar.bz2 && \
+    cd expat-2.4.8 && \
+    ./configure --enable-static --disable-shared --prefix=/usr && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN wget https://www.nlnetlabs.nl/downloads/unbound/unbound-1.16.2.tar.gz && \
+    echo "2e32f283820c24c51ca1dd8afecfdb747c7385a137abe865c99db4b257403581 unbound-1.16.2.tar.gz" | sha256sum -c && \
+    tar -xzf unbound-1.16.2.tar.gz && \
+    rm unbound-1.16.2.tar.gz && \
+    cd unbound-1.16.2 && \
+    ./configure --disable-shared --enable-static --without-pyunbound --with-libexpat=/usr --with-ssl=/usr --with-libevent=no --without-pythonmodule --disable-flto --with-pthreads --with-libunbound-only --with-pic && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN rm /usr/lib/x86_64-linux-gnu/libX11.a && \
+    rm /usr/lib/x86_64-linux-gnu/libXext.a && \
+    rm /usr/lib/x86_64-linux-gnu/libX11-xcb.a && \
+    git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
+    cd qt5 && \
+    git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtdeclarative.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtgraphicaleffects.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtimageformats.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtmultimedia.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtquickcontrols.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtquickcontrols2.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtsvg.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qttools.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qttranslations.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtx11extras.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtxmlpatterns.git -b ${QT_VERSION} --depth 1 && \
     sed -ri s/\(Libs:.*\)/\\1\ -lexpat/ /usr/local/lib/pkgconfig/fontconfig.pc && \
     sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.pc && \
     sed -ri s/\(Libs:.*\)/\\1\ -lXau/ /usr/local/lib/pkgconfig/xcb.pc && \
+    sed -i s/\\/usr\\/X11R6\\/lib64/\\/usr\\/local\\/lib/ qtbase/mkspecs/linux-g++-64/qmake.conf && \
     ./configure --prefix=/usr -platform linux-g++-64 -opensource -confirm-license -release -static -no-avx \
-    -opengl desktop -qpa xcb -system-freetype -fontconfig -glib \
-    -no-dbus -no-openssl -no-sql-sqlite -no-use-gold-linker \
+    -opengl desktop -qpa xcb -xcb -xcb-xlib -feature-xlib -system-freetype -fontconfig -glib \
+    -no-dbus -no-feature-qml-worker-script -no-linuxfb -no-openssl -no-sql-sqlite -no-kms -no-use-gold-linker \
     -qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \
     -skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d \
     -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing \
@@ -133,75 +234,63 @@ RUN apt install -y libgl1-mesa-dev libglib2.0-dev libxkbcommon-dev && \
     cd ../../../.. && \
     rm -rf $(pwd)
 
-RUN apt install -y libudev-dev && \
-    git clone -b v1.0.23 --depth 1 https://github.com/libusb/libusb && \
+RUN git clone -b v1.0.26 --depth 1 https://github.com/libusb/libusb && \
     cd libusb && \
-    git reset --hard e782eeb2514266f6738e242cdcb18e3ae1ed06fa && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    git reset --hard 4239bc3a50014b8e6a5a2a59df1fff3b7469543b && \
+    ./autogen.sh --disable-shared --enable-static && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN git clone -b hidapi-0.9.0 --depth 1 https://github.com/libusb/hidapi && \
+RUN git clone -b hidapi-0.12.0 --depth 1 https://github.com/libusb/hidapi && \
     cd hidapi && \
-    git reset --hard 7da5cc91fc0d2dbe4df4f08cd31f6ca1a262418f && \
+    git reset --hard 76108294092c023a4ece99eb3219559cea0d5066 && \
     ./bootstrap && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static && \
+    ./configure --disable-shared --enable-static && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN git clone -b libX11-1.6.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libx11 && \
-    cd libx11 && \
-    git reset --hard db7cca17ad7807e92a928da9d4c68a00f4836da2 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b libXext-1.3.4 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxext && \
-    cd libxext && \
-    git reset --hard ebb167f34a3514783966775fb12573c4ed209625 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN apt install -y libsodium-dev && \
-    git clone -b v4.3.2 --depth 1 https://github.com/zeromq/libzmq && \
+RUN git clone -b v4.3.4 --depth 1 https://github.com/zeromq/libzmq && \
     cd libzmq && \
-    git reset --hard a84ffa12b2eb3569ced199660bac5ad128bff1f0 && \
+    git reset --hard 4097855ddaaa65ed7b5e8cb86d143842a594eebd && \
     ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-libunwind --with-libsodium && \
+    ./configure --disable-shared --enable-static --disable-libunwind --with-libsodium && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN git clone -b libgpg-error-1.38 --depth 1 git://git.gnupg.org/libgpg-error.git && \
+RUN git clone -b libgpg-error-1.45 --depth 1 git://git.gnupg.org/libgpg-error.git && \
     cd libgpg-error && \
-    git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 && \
+    git reset --hard dbac537e5e865fb6f3aa8596d213aa8c47a9dea1 && \
     ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-doc --disable-tests && \
+    ./configure --disable-shared --enable-static --disable-doc --disable-tests && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN git clone -b libgcrypt-1.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git && \
+RUN git clone -b libgcrypt-1.10.1 --depth 1 git://git.gnupg.org/libgcrypt.git && \
     cd libgcrypt && \
-    git reset --hard 56606331bc2a80536db9fc11ad53695126007298 && \
+    git reset --hard ae0e567820c37f9640440b3cff77d7c185aa6742 && \
     ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-doc && \
+    ./configure --disable-shared --enable-static --disable-doc && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN git clone -b v3.10.0 --depth 1 https://github.com/protocolbuffers/protobuf && \
+RUN git clone -b v21.5 --depth 1 https://github.com/protocolbuffers/protobuf && \
     cd protobuf && \
-    git reset --hard 6d4e7fd7966c989e38024a8ea693db83758944f1 && \
+    git reset --hard ab840345966d0fa8e7100d771c92a73bfbadd25c && \
     ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --enable-static --disable-shared && \
+    ./configure --enable-static --disable-shared && \
     make -j$THREADS && \
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-RUN apt install -y cmake libusb-1.0-0-dev
+RUN git clone -b v3.24.0 --depth 1 https://github.com/Kitware/CMake && \
+    cd CMake && \
+    git reset --hard 4be24f031a4829db75b85062cc67125035d8831e && \
+    ./bootstrap && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)

Dockerfile.windows

@@ -1,6 +1,8 @@
 FROM ubuntu:20.04
 
 ARG THREADS=1
+ARG QT_VERSION=v5.15.6-lts-lgpl
+ENV SOURCE_DATE_EPOCH=1397818193
 
 RUN apt update && \
     DEBIAN_FRONTEND=noninteractive apt install -y build-essential cmake g++-mingw-w64 gettext git libtool pkg-config \
@@ -10,35 +12,44 @@ RUN apt update && \
 RUN update-alternatives --set x86_64-w64-mingw32-g++ $(which x86_64-w64-mingw32-g++-posix) && \
     update-alternatives --set x86_64-w64-mingw32-gcc $(which x86_64-w64-mingw32-gcc-posix)
 
-RUN git clone -b v0.17.0.0 --depth 1 https://github.com/monero-project/monero && \
+RUN git clone -b v0.18.1.0 --depth 1 https://github.com/monero-project/monero && \
     cd monero && \
-    git reset --hard d27d4526fe89b7cdeb4b296280c4a6cf7efe21f8 && \
+    git reset --hard 727bc5b6878170332bf2d838f2c60d1c8dc685c8 && \
     cp -a contrib/depends / && \
     cd .. && \
     rm -rf monero
 
 RUN make -j$THREADS -C /depends HOST=x86_64-w64-mingw32 NO_QT=1
 
-RUN curl -LO https://download.qt.io/archive/qt/5.9/5.9.9/single/qt-everywhere-opensource-src-5.9.9.tar.xz && \
-    echo "5ce285209290a157d7f42ec8eb22bf3f1d76f2e03a95fc0b99b553391be01642 qt-everywhere-opensource-src-5.9.9.tar.xz" > hashsum.txt && \
-    sha256sum -c hashsum.txt && \
-    tar -xf qt-everywhere-opensource-src-5.9.9.tar.xz && \
-    rm qt-everywhere-opensource-src-5.9.9.tar.xz && \
-    cd qt-everywhere-opensource-src-5.9.9 && \
+RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
+    cd qt5 && \
+    git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtdeclarative.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtgraphicaleffects.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtimageformats.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtmultimedia.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtquickcontrols.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtquickcontrols2.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtsvg.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qttools.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qttranslations.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtxmlpatterns.git -b ${QT_VERSION} --depth 1 && \
     ./configure --prefix=/depends/x86_64-w64-mingw32 -xplatform win32-g++ \
     -device-option CROSS_COMPILE=/usr/bin/x86_64-w64-mingw32- \
     -I $(pwd)/qtbase/src/3rdparty/angle/include \
     -opensource -confirm-license -release -static -static-runtime -opengl dynamic -no-angle \
     -no-avx -no-openssl -no-sql-sqlite \
+    -no-feature-qml-worker-script -no-openssl -no-sql-sqlite \
     -qt-freetype -qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \
-    -skip gamepad -skip location -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcanvas3d -skip qtcharts \
-    -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtmacextras \
-    -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtscript -skip qtscxml -skip qtsensors \
-    -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttools -skip qtvirtualkeyboard -skip qtwayland \
-    -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtwinextras -skip qtx11extras \
+    -skip gamepad -skip location -skip qt3d -skip qtactiveqt -skip qtandroidextras \
+    -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdoc \
+    -skip qtgamepad -skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing \
+    -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport \
+    -skip qtspeech -skip qttools -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel \
+    -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtwinextras -skip qtx11extras \
     -skip serialbus -skip webengine \
     -nomake examples -nomake tests -nomake tools && \
-    make QMAKE="$(pwd)/qtbase/bin/qmake CONFIG-='debug debug_and_release'" -j$THREADS && \
+    make -j$THREADS && \
     make -j$THREADS install && \
     cd qttools/src/linguist/lrelease && \
     ../../../../qtbase/bin/qmake && \

LeftPanel.qml

@@ -58,12 +58,9 @@ Rectangle {
     signal historyClicked()
     signal transferClicked()
     signal receiveClicked()
-    signal txkeyClicked()
-    signal sharedringdbClicked()
+    signal advancedClicked()
     signal settingsClicked()
     signal addressBookClicked()
-    signal miningClicked()
-    signal signClicked()
     signal accountClicked()
 
     function selectItem(pos) {
@@ -72,10 +69,6 @@ Rectangle {
         else if(pos === "Transfer") menuColumn.previousButton = transferButton
         else if(pos === "Receive")  menuColumn.previousButton = receiveButton
         else if(pos === "AddressBook") menuColumn.previousButton = addressBookButton
-        else if(pos === "Mining") menuColumn.previousButton = miningButton
-        else if(pos === "TxKey")  menuColumn.previousButton = txkeyButton
-        else if(pos === "SharedRingDB")  menuColumn.previousButton = sharedringdbButton
-        else if(pos === "Sign") menuColumn.previousButton = signButton
         else if(pos === "Settings") menuColumn.previousButton = settingsButton
         else if(pos === "Advanced") menuColumn.previousButton = advancedButton
         else if(pos === "Account") menuColumn.previousButton = accountButton
@@ -127,7 +120,7 @@ Rectangle {
                     width: 260
                     height: 135
                     fillMode: Image.PreserveAspectFit
-                    source: MoneroComponents.Style.blackTheme ? "qrc:///images/card-background-black.png" : "qrc:///images/card-background-white.png"
+                    source: MoneroComponents.Style.blackTheme ? "qrc:///images/card-background-black" + (currentAccountIndex % MoneroComponents.Style.accountColors.length) + ".png" : "qrc:///images/card-background-white.png"
                 }
 
                 DropShadow {
@@ -367,7 +360,8 @@ Rectangle {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Account") + translationManager.emptyString
-                symbol: qsTr("T") + translationManager.emptyString
+                symbol: (isMac ? "⌃" : qsTr("Ctrl+")) + "T" + translationManager.emptyString
+
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = accountButton
@@ -388,7 +382,7 @@ Rectangle {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Send") + translationManager.emptyString
-                symbol: qsTr("S") + translationManager.emptyString
+                symbol: (isMac ? "⌃" : qsTr("Ctrl+")) + "S" + translationManager.emptyString
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = transferButton
@@ -410,7 +404,7 @@ Rectangle {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Address book") + translationManager.emptyString
-                symbol: qsTr("B") + translationManager.emptyString
+                symbol: (isMac ? "⌃" : qsTr("Ctrl+")) + "B" + translationManager.emptyString
                 under: transferButton
                 onClicked: {
                     parent.previousButton.checked = false
@@ -432,7 +426,7 @@ Rectangle {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Receive") + translationManager.emptyString
-                symbol: qsTr("R") + translationManager.emptyString
+                symbol: (isMac ? "⌃" : qsTr("Ctrl+")) + "R" + translationManager.emptyString
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = receiveButton
@@ -454,7 +448,7 @@ Rectangle {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Transactions") + translationManager.emptyString
-                symbol: qsTr("H") + translationManager.emptyString
+                symbol: (isMac ? "⌃" : qsTr("Ctrl+")) + "H" + translationManager.emptyString
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = historyButton
@@ -476,10 +470,11 @@ Rectangle {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Advanced") + translationManager.emptyString
-                symbol: qsTr("D") + translationManager.emptyString
+                symbol: (isMac ? "⌃" : qsTr("Ctrl+")) + "D" + translationManager.emptyString
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = advancedButton
+                    panel.advancedClicked()
                 }
             }
 
@@ -490,105 +485,13 @@ Rectangle {
                 anchors.leftMargin: 20
             }
 
-            // ------------- Mining tab ---------------
-            MoneroComponents.MenuButton {
-                id: miningButton
-                visible: !isAndroid && !isIOS && appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                text: qsTr("Mining") + translationManager.emptyString
-                symbol: qsTr("M") + translationManager.emptyString
-                under: advancedButton
-                onClicked: {
-                    parent.previousButton.checked = false
-                    parent.previousButton = miningButton
-                    panel.miningClicked()
-                }
-            }
-
-            MoneroComponents.MenuButtonDivider {
-                visible: miningButton.present && appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.leftMargin: 20
-            }
-
-            // ------------- TxKey tab ---------------
-            MoneroComponents.MenuButton {
-                id: txkeyButton
-                visible: appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                text: qsTr("Prove/check") + translationManager.emptyString
-                symbol: qsTr("K") + translationManager.emptyString
-                under: advancedButton
-                onClicked: {
-                    parent.previousButton.checked = false
-                    parent.previousButton = txkeyButton
-                    panel.txkeyClicked()
-                }
-            }
-
-            MoneroComponents.MenuButtonDivider {
-                visible: txkeyButton.present && appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.leftMargin: 20
-            }
-
-            // ------------- Shared RingDB tab ---------------
-            MoneroComponents.MenuButton {
-                id: sharedringdbButton
-                visible: appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                text: qsTr("Shared RingDB") + translationManager.emptyString
-                symbol: qsTr("G") + translationManager.emptyString
-                under: advancedButton
-                onClicked: {
-                    parent.previousButton.checked = false
-                    parent.previousButton = sharedringdbButton
-                    panel.sharedringdbClicked()
-                }
-            }
-
-            MoneroComponents.MenuButtonDivider {
-                visible: sharedringdbButton.present && appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.leftMargin: 20
-            }
-
-            // ------------- Sign/verify tab ---------------
-            MoneroComponents.MenuButton {
-                id: signButton
-                visible: appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                text: qsTr("Sign/verify") + translationManager.emptyString
-                symbol: qsTr("I") + translationManager.emptyString
-                under: advancedButton
-                onClicked: {
-                    parent.previousButton.checked = false
-                    parent.previousButton = signButton
-                    panel.signClicked()
-                }
-            }
-
-            MoneroComponents.MenuButtonDivider {
-                visible: signButton.present && appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.leftMargin: 20
-            }
-
             // ------------- Settings tab ---------------
             MoneroComponents.MenuButton {
                 id: settingsButton
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Settings") + translationManager.emptyString
-                symbol: qsTr("E") + translationManager.emptyString
+                symbol: (isMac ? "⌃" : qsTr("Ctrl+")) + "E" + translationManager.emptyString
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = settingsButton

Makefile

@@ -1,53 +1,70 @@
 ANDROID_STANDALONE_TOOLCHAIN_PATH ?= /usr/local/toolchain
+MANUAL_SUBMODULES ?= OFF
 
 dotgit=$(shell ls -d .git/config)
-ifneq ($(dotgit), .git/config)
-  USE_SINGLE_BUILDDIR=1
+ifeq ($(dotgit), .git/config)
+  ifeq ($(shell git --version > /dev/null 2>&1 ; echo $$?), 0)
+	git = yes
+  else
+    $(warning git command not found)
+  endif
 endif
 
-subbuilddir:=$(shell echo  `uname | sed -e 's|[:/\\ \(\)]|_|g'`/`git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g'`)
+builddir := build
+topdir := ../..
 ifeq ($(USE_SINGLE_BUILDDIR), OFF)
-  builddir := build/"$(subbuilddir)"
-  topdir   := ../../../..
-  deldirs  := $(builddir)
-else
-  builddir := build
-  topdir   := ../..
-  deldirs  := $(builddir)/debug $(builddir)/release $(builddir)/fuzz
-endif
+  os := $(shell echo  `uname | sed -e 's|[:/\\ \(\)]|_|g'`)
+  builddir := $(builddir)/$(os)
+  topdir := $(topdir)/..
 
+  ifdef git
+    branch := $(shell git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g')
+    builddir := $(builddir)/$(branch)
+    topdir := $(topdir)/..
+  endif
+
+  deldirs := $(builddir)
+else
+  deldirs := $(builddir)/debug $(builddir)/release $(builddir)/fuzz
+endif
 
 default:
-	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},OFF) -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
+	mkdir -p build && cd build && cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
 debug:
-	mkdir -p build && cd build && cmake -D DEV_MODE=$(or ${DEV_MODE},ON) .. && $(MAKE) VERBOSE=1
+	mkdir -p build && cd build && cmake -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D CMAKE_BUILD_TYPE=Debug .. && $(MAKE) VERBOSE=1
 
 depends:
 	mkdir -p build/$(target)/release
-	cd build/$(target)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -D BUILD_TAG=$(tag) -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake ../../.. && $(MAKE)
+	cd build/$(target)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D BUILD_TAG=$(tag) -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake ../../.. && $(MAKE)
 
 devmode:
-	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},ON) -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
+	mkdir -p build && cd build && cmake -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
 clean:
 	mkdir -p build && cd build && rm -rf *
 scanner:
-	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},ON) -D WITH_SCANNER=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
+	mkdir -p build && cd build && cmake -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D WITH_SCANNER=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
 
 release:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="x86-64" -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
+	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
+
+release-linux-armv8:
+	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="armv8-a" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="linux-armv8" $(topdir) && $(MAKE)
+
+release-linux-ppc64le:
+	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="ppc64le" -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
 
 release-static:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
+	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
 
 debug-static-win64:
-	mkdir -p $(builddir)/debug && cd $(builddir)/debug && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},ON) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Debug -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
+	mkdir -p $(builddir)/debug && cd $(builddir)/debug && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Debug -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
 
 debug-static-mac64:
 	mkdir -p $(builddir)/debug
-	cd $(builddir)/debug && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},ON) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="mac-x64" $(topdir) && $(MAKE)
+	cd $(builddir)/debug && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Debug -D BUILD_TAG="mac-x64" $(topdir) && $(MAKE)
 
 release-static-win64:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
+	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
 
 release-win64:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=OFF -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
+	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=OFF -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)

MiddlePanel.qml

@@ -51,25 +51,22 @@ Rectangle {
     property alias flickable: mainFlickable
 
     property Transfer transferView: Transfer {
-        onPaymentClicked: root.paymentClicked(address, paymentId, amount, mixinCount, priority, description)
+        onPaymentClicked: root.paymentClicked(recipients, paymentId, mixinCount, priority, description)
         onSweepUnmixableClicked: root.sweepUnmixableClicked()
     }
     property Receive receiveView: Receive { }
     property Merchant merchantView: Merchant { }
-    property TxKey txkeyView: TxKey { }
-    property SharedRingDB sharedringdbView: SharedRingDB { }
     property History historyView: History { }
-    property Sign signView: Sign { }
+    property Advanced advancedView: Advanced { }
     property Settings settingsView: Settings { }
-    property Mining miningView: Mining { }
     property AddressBook addressBookView: AddressBook { }
     property Keys keysView: Keys { }
     property Account accountView: Account { }
 
-    signal paymentClicked(string address, string paymentId, string amount, int mixinCount, int priority, string description)
+    signal paymentClicked(var recipients, string paymentId, int mixinCount, int priority, string description)
     signal sweepUnmixableClicked()
     signal generatePaymentIdInvoked()
-    signal getProofClicked(string txid, string address, string message);
+    signal getProofClicked(string txid, string address, string message, string amount);
     signal checkProofClicked(string txid, string address, string message, string signature);
 
     Rectangle {
@@ -119,6 +116,12 @@ Rectangle {
         transferView.sendTo(address, paymentId, description);
     }
 
+    // open Transactions page with search term in search field
+    function searchInHistory(searchTerm){
+        root.state = "History";
+        historyView.searchInHistory(searchTerm);
+    }
+
         states: [
             State {
                 name: "History"
@@ -136,30 +139,18 @@ Rectangle {
                 name: "Merchant"
                 PropertyChanges { target: root; currentView: merchantView }
                 PropertyChanges { target: mainFlickable; contentHeight: merchantView.merchantHeight + 80 }
-            }, State {
-                name: "TxKey"
-                PropertyChanges { target: root; currentView: txkeyView }
-                PropertyChanges { target: mainFlickable; contentHeight: txkeyView.txkeyHeight + 80 }
-            }, State {
-                name: "SharedRingDB"
-                PropertyChanges { target: root; currentView: sharedringdbView }
-                PropertyChanges { target: mainFlickable; contentHeight: sharedringdbView.panelHeight + 80  }
             }, State {
                 name: "AddressBook"
                 PropertyChanges { target: root; currentView: addressBookView }
                 PropertyChanges { target: mainFlickable; contentHeight: addressBookView.addressbookHeight + 80 }
             }, State {
-                name: "Sign"
-                PropertyChanges { target: root; currentView: signView }
-                PropertyChanges { target: mainFlickable; contentHeight: signView.signHeight + 80 }
+                name: "Advanced"
+                PropertyChanges { target: root; currentView: advancedView }
+                PropertyChanges { target: mainFlickable; contentHeight: advancedView.panelHeight }
             }, State {
                 name: "Settings"
                 PropertyChanges { target: root; currentView: settingsView }
                 PropertyChanges { target: mainFlickable; contentHeight: settingsView.settingsHeight }
-            }, State {
-                name: "Mining"
-                PropertyChanges { target: root; currentView: miningView }
-                PropertyChanges { target: mainFlickable; contentHeight: miningView.miningHeight + 80 }
             }, State {
                 name: "Keys"
                 PropertyChanges { target: root; currentView: keysView }
@@ -168,7 +159,7 @@ Rectangle {
                 name: "Account"
                 PropertyChanges { target: root; currentView: accountView }
                 PropertyChanges { target: mainFlickable; contentHeight: accountView.accountHeight + 80 }
-            }	
+            }
         ]
 
     ColumnLayout {

README.md

@@ -1,13 +1,30 @@
 # Monero GUI
 
-Copyright (c) 2014-2019, The Monero Project
+Copyright (c) 2014-2022, The Monero Project
+
+## Table of Contents
+  * [Development resources](#development-resources)
+  * [Vulnerability response](#vulnerability-response)
+  * [Introduction](#introduction)
+  * [About this project](#about-this-project)
+  * [Supporting the project](#supporting-the-project)
+  * [License](#license)
+  * [Translations](#translations)
+  * [Installing the Monero GUI from a package](#installing-the-monero-gui-from-a-package)
+  * [Compiling the Monero GUI from source](#compiling-the-monero-gui-from-source)
+    + [Building Reproducible Windows static binaries with Docker (any OS)](#building-reproducible-windows-static-binaries-with-docker-any-os)
+    + [Building Reproducible Linux static binaries with Docker (any OS)](#building-reproducible-linux-static-binaries-with-docker-any-os)
+    + [Building Android APK with Docker (any OS) *Experimental*](#building-android-apk-with-docker-any-os-experimental)
+    + [Building on Linux](#building-on-linux)
+    + [Building on OS X](#building-on-os-x)
+    + [Building on Windows](#building-on-windows)
 
 ## Development resources
 
 - Web: [getmonero.org](https://getmonero.org)
 - Mail: [dev@getmonero.org](mailto:dev@getmonero.org)
 - Github: [https://github.com/monero-project/monero-gui](https://github.com/monero-project/monero-gui)
-- IRC: [#monero-dev on Freenode](irc://chat.freenode.net/#monero-dev)
+- IRC: [#monero-gui on Libera](irc://irc.libera.chat/#monero-gui)
 - Translation platform (Weblate): [translate.getmonero.org](https://translate.getmonero.org)
 - UI Design: [Monero-GUI on Figma](https://www.figma.com/file/DplJ2DDQfIKiuRvolHX2hN/Monero-GUI)
 
@@ -44,8 +61,8 @@ GUI development funding and/or some supporting services are also graciously prov
 
 [<img width="150" src="https://www.getmonero.org/img/sponsors/tarilabs.png"/>](https://tarilabs.com/)
 [<img width="150" src="https://www.getmonero.org/img/sponsors/globee.png"/>](https://globee.com/)
-[<img width="150" src="https://www.getmonero.org/img/sponsors/symas.png"/>](https://www.symas.com/)
-[<img width="150" src="https://www.getmonero.org/img/sponsors/forked_logo.png"/>](https://www.forked.net/)
+[<img width="150" src="https://www.getmonero.org/img/sponsors/symas.png"/>](https://symas.com/)
+[<img width="150" src="https://www.getmonero.org/img/sponsors/forked_logo.png"/>](http://www.forked.net/)
 [<img width="150" src="https://www.getmonero.org/img/sponsors/macstadium.png"/>](https://www.macstadium.com/)
 
 There are also several mining pools that kindly donate a portion of their fees, [a list of them can be found on our Bitcointalk post](https://bitcointalk.org/index.php?topic=583449.0).
@@ -58,9 +75,10 @@ See [LICENSE](LICENSE).
 
 Do you speak a second language and would like to help translate the Monero GUI? Check out Weblate, our localization platform, at [translate.getmonero.org](https://translate.getmonero.org/). Choose the language and suggest a translation for a string or review an existing one. The Localization Workgroup made [a guide with step-by-step instructions](https://github.com/monero-ecosystem/monero-translations/blob/master/weblate.md) for Weblate.
 
-If you need help/support or any info you can contact the localization workgroup on the IRC channel #monero-translations (relayed on matrix/riot and MatterMost) or by email at translate[at]getmonero[dot]org. For more info about the Localization workgroup: [github.com/monero-ecosystem/monero-translations](https://github.com/monero-ecosystem/monero-translations)
+If you need help/support or any info you can contact the localization workgroup on the IRC channel #monero-translations (relayed on [Matrix](https://matrix.to/#/!BKMbQLMDzHKzmtrBfg:matrix.org?via=monero.social&via=matrix.org&via=libera.chat)) or by email at translate[at]getmonero[dot]org. For more info about the Localization workgroup: [github.com/monero-ecosystem/monero-translations](https://github.com/monero-ecosystem/monero-translations)
 
 Status of the translations:  
+
 <a href="https://translate.getmonero.org/engage/monero/?utm_source=widget">
 <img src="https://translate.getmonero.org/widgets/monero/-/gui-wallet/horizontal-auto.svg" alt="Translation status" />
 </a>
@@ -71,8 +89,9 @@ Packages are available for
 * Arch Linux: [monero-gui](https://www.archlinux.org/packages/community/x86_64/monero-gui/)
 * Debian: See the [whonix/monero-gui repository](https://gitlab.com/whonix/monero-gui#how-to-install-monero-using-apt-get)
 * Void Linux: `xbps-install -S monero-gui`
+* Flatpak: [Monero GUI](https://flathub.org/apps/details/org.getmonero.Monero)
 * GuixSD: `guix package -i monero-gui`
-* macOS (homebrew): `brew cask install monero-wallet`
+* macOS (homebrew): `brew install --cask monero-wallet`
 
 Packaging for your favorite distribution would be a welcome contribution!
 
@@ -80,13 +99,16 @@ Packaging for your favorite distribution would be a welcome contribution!
 
 *Note*: Qt 5.9.7 is the minimum version required to build the GUI.
 
-### Building Windows static binaries with Docker (any OS)
+*Note*: Official GUI releases use monero-wallet-gui from this process alongside the supporting binaries (monerod, etc) from the [CLI deterministic builds](https://github.com/monero-project/monero/blob/master/contrib/gitian/README.md).
+
+### Building Reproducible Windows static binaries with Docker (any OS)
 
 1. Install Docker [https://docs.docker.com/engine/install/](https://docs.docker.com/engine/install/)
 2. Clone the repository
    ```
-   git clone --recursive https://github.com/monero-project/monero-gui.git
+   git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
    ```
+   \* `master` - replace with the desired version tag (e.g. `v0.18.1.2`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui
@@ -102,13 +124,14 @@ Packaging for your favorite distribution would be a welcome contribution!
    \* `4` - number of CPU threads to use
 5. Monero GUI Windows static binaries will be placed in  `monero-gui/build/x86_64-w64-mingw32/release/bin` directory
 
-### Building Linux static binaries with Docker (any OS)
+### Building Reproducible Linux static binaries with Docker (any OS)
 
 1. Install Docker [https://docs.docker.com/engine/install/](https://docs.docker.com/engine/install/)
 2. Clone the repository
    ```
-   git clone --recursive https://github.com/monero-project/monero-gui.git
+   git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
    ```
+   \* `master` - replace with the desired version tag (e.g. `v0.18.1.2`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui
@@ -123,8 +146,62 @@ Packaging for your favorite distribution would be a welcome contribution!
    \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory  
    \* `4` - number of CPU threads to use
 5. Monero GUI Linux static binaries will be placed in  `monero-gui/build/release/bin` directory
+6. (*Optional*) Compare `monero-wallet-gui` SHA-256 hash to the one obtained from a trusted source
+   ```
+   docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'shasum -a 256 /monero-gui/build/release/bin/monero-wallet-gui'
+   ```
+   \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory  
 
-### On Linux:
+### Building Android APK with Docker (any OS) *Experimental*
+ - Minimum Android 9 Pie (API 28)
+ - ARMv8-A 64-bit CPU
+1. Install Docker [https://docs.docker.com/engine/install/](https://docs.docker.com/engine/install/)
+2. Clone the repository
+   ```
+   git clone --recursive https://github.com/monero-project/monero-gui.git
+   ```
+3. Prepare build environment
+   ```
+   cd monero-gui
+   docker build --tag monero:build-env-android --build-arg THREADS=4 --file Dockerfile.android .
+   ```
+   \* `4` - number of CPU threads to use
+
+4. Build
+   ```
+   docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -e THREADS=4 monero:build-env-android
+   ```
+   \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory  
+   \* `4` - number of CPU threads to use
+5. Monero GUI APK will be placed in  `monero-gui/build/Android/release/android-build` directory
+6. Deploy
+   * Using ADB (Android debugger bridge)
+     - [Enable adb debugging on your device](https://developer.android.com/studio/command-line/adb.html#Enabling)
+      * Connect your device with USB and install Monero GUI APK with adb:
+      ```
+      adb install build/Android/release/android-build/monero-gui.apk
+      ```
+      * Troubleshooting:
+      ```
+      adb devices -l
+      adb logcat
+      ```
+      * If using adb inside docker, make sure you did
+      ```
+      docker run -v /dev/bus/usb:/dev/bus/usb --privileged
+      ```
+   * Using a web server
+      ```
+      mkdir /usr/tmp
+      cp build/Android/release/android-build/monero-gui.apk /usr/tmp
+      docker run -d -v /usr/tmp:/usr/share/nginx/html:ro -p 8080:80 nginx
+      ```
+      Now it should be accessible through a web browser at
+      ```
+      http://<your.local.ip>:8080/QtApp-debug.apk
+      ```
+
+### Building on Linux
 
 (Tested on Ubuntu 17.10 x64, Ubuntu 18.04 x64 and Gentoo x64)
 
@@ -132,11 +209,11 @@ Packaging for your favorite distribution would be a welcome contribution!
 
   - For Debian distributions (Debian, Ubuntu, Mint, Tails...)
 
-	`sudo apt install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev libprotobuf-dev protobuf-compiler libgcrypt20-dev`
+	`sudo apt install build-essential cmake miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev libprotobuf-dev protobuf-compiler libgcrypt20-dev libboost-chrono-dev libboost-date-time-dev libboost-filesystem-dev libboost-locale-dev libboost-program-options-dev libboost-regex-dev libboost-serialization-dev libboost-system-dev libboost-thread-dev`
 
   - For Gentoo
 
-	`sudo emerge app-arch/xz-utils app-doc/doxygen dev-cpp/gtest dev-libs/boost dev-libs/expat dev-libs/openssl dev-util/cmake media-gfx/graphviz net-dns/unbound net-libs/ldns net-libs/miniupnpc net-libs/zeromq sys-libs/libunwind dev-libs/libsodium dev-libs/hidapi dev-libs/libgcrypt`
+	`sudo emerge app-arch/xz-utils app-doc/doxygen dev-cpp/gtest dev-libs/boost dev-libs/expat dev-libs/openssl dev-util/cmake media-gfx/graphviz net-dns/unbound net-libs/miniupnpc net-libs/zeromq sys-libs/libunwind dev-libs/libsodium dev-libs/hidapi dev-libs/libgcrypt`
 
   - For Fedora
 
@@ -152,9 +229,12 @@ The following instructions will fetch Qt from your distribution's repositories i
 
   - For Ubuntu 17.10+
 
-    `sudo apt install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev`
+    `sudo apt install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtqml-models2 qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-platform qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev`
 
   - For Gentoo
+  
+   
+    The *qml* USE flag must be enabled.
 
     `sudo emerge dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 dev-qt/qtgraphicaleffects:5`
 
@@ -162,13 +242,11 @@ The following instructions will fetch Qt from your distribution's repositories i
 
     - For Ubuntu
 
-      `sudo apt install qtmultimedia5-dev qml-module-qtmultimedia libzbar-dev`
+      `sudo apt install qtmultimedia5-dev qml-module-qtmultimedia`
 
-    - For Gentoo
+    - For Gentoo      
 
-      The *qml* USE flag must be enabled.
-
-      `emerge dev-qt/qtmultimedia:5 media-gfx/zbar`
+      `emerge dev-qt/qtmultimedia:5`
 
 
 3. Clone repository
@@ -180,15 +258,24 @@ The following instructions will fetch Qt from your distribution's repositories i
 
 4. Build
 
+    If on x86-64:
+
     ```
     make release -j4
     ```
+
+    If on ppc64le:
+
+    ```
+    make release-linux-ppc64le -j4
+    ```
+
     \* `4` - number of CPU threads to use  
-    \* Add `CMAKE_PREFIX_PATH` enviroment variable to set a custom Qt install directory, e.g. `CMAKE_PREFIX_PATH=$HOME/Qt/5.9.7/gcc_64 make release -j4`
+    \* Add `CMAKE_PREFIX_PATH` environment variable to set a custom Qt install directory, e.g. `CMAKE_PREFIX_PATH=$HOME/Qt/5.9.7/gcc_64 make release -j4`
 
 The executable can be found in the build/release/bin folder.
 
-### On OS X:
+### Building on OS X
 
 1. Install Xcode from AppStore
 
@@ -196,7 +283,7 @@ The executable can be found in the build/release/bin folder.
 
 3. Install [monero](https://github.com/monero-project/monero) dependencies:
 
-  `brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf libgcrypt`
+  `brew install cmake pkg-config openssl boost unbound hidapi zmq libpgm libsodium miniupnpc expat libunwind-headers protobuf libgcrypt`
 
 4. Install Qt:
 
@@ -215,13 +302,13 @@ The executable can be found in the build/release/bin folder.
     make release -j4
     ```
     \* `4` - number of CPU threads to use  
-    \* Add `CMAKE_PREFIX_PATH` enviroment variable to set a custom Qt install directory, e.g. `CMAKE_PREFIX_PATH=$HOME/Qt/5.9.7/clang_64 make release -j4`
+    \* Add `CMAKE_PREFIX_PATH` environment variable to set a custom Qt install directory, e.g. `CMAKE_PREFIX_PATH=$HOME/Qt/5.9.7/clang_64 make release -j4`
 
 The executable can be found in the `build/release/bin` folder.
 
 For building an application bundle see `DEPLOY.md`.
 
-### On Windows:
+### Building on Windows
 
 The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not officially supported anymore.
 
@@ -235,12 +322,6 @@ The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not off
     pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-libgcrypt
     ```
 
-    Optional : To build the flag `WITH_SCANNER`
-
-      ```
-      pacman -S mingw-w64-x86_64-zbar
-      ```
-
     You find more details about those dependencies in the [Monero documentation](https://github.com/monero-project/monero). Note that that there is no more need to compile Boost from source; like everything else, you can install it now with a MSYS2 package.
 
 4. Install Qt5

android/README.md

@@ -1,53 +0,0 @@
-Copyright (c) 2014-2018, The Monero Project
-
-
-## Current status : ALPHA
-
- - Minimum Android 5.0 (api level 21)
- - Modal dialogs can appear in background giving the feeling that the application is frozen (Work around : turn screen off/on or switch to another app and back)
-
-## Build using Docker
-
-# Base environnement
-
-        cd monero/utils/build_scripts
-        docker build -f android32.Dockerfile -t monero-android .
-        cd ..
-
-# Build GUI
-
-        cd android/docker
-        docker build -t monero-gui-android .
-        docker create -it --name monero-gui-android monero-gui-android bash
-
-# Get the apk
-
-        docker cp monero-gui-android:/opt/android/monero-gui/build/release/bin/bin/QtApp-debug.apk .
-       
-## Deployment
-
-- Using ADB (Android debugger bridge) : 
-
-  First, see section [Enable adb debugging on your device](https://developer.android.com/studio/command-line/adb.html#Enabling)
-  The only place where we are allowed to play is `/data/local/tmp`. So : 
-
-        adb  push /opt/android/monero-gui/build/release/bin/bin/QtApp-debug.apk /data/local/tmp
-        adb  shell pm install -r /data/local/tmp/QtApp-debug.apk
-   
-  - Troubleshooting: 
-  
-        adb devices -l
-        adb logcat
-	
-    if using adb inside docker, make sure you did "docker run -v /dev/bus/usb:/dev/bus/usb --privileged"
-	
-- Using a web server
-
-        mkdir /usr/tmp
-        cp QtApp-debug.apk /usr/tmp
-        docker run -d -v /usr/tmp:/usr/share/nginx/html:ro -p 8080:80 nginx
-
-  Now it should be accessible through a web browser at 
-  
-        http://<your.local.ip>:8080/QtApp-debug.apk
-  

android/docker/Dockerfile

@@ -1,107 +0,0 @@
-FROM monero-android
-
-#INSTALL JAVA
-RUN echo "deb http://ftp.fr.debian.org/debian/ jessie-backports main contrib non-free" >> /etc/apt/sources.list
-RUN dpkg --add-architecture i386 \
-    && apt-get update \
-    && apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 libz1:i386 \
-    && apt-get install -y -t jessie-backports ca-certificates-java openjdk-8-jdk-headless openjdk-8-jre-headless ant
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
-ENV PATH $JAVA_HOME/bin:$PATH
-
-#Get Qt
-ENV QT_VERSION 5.8
-
-RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} \
-    && cd qt5 \
-    && perl init-repository 
-
-## Note: Need to use libc++ but Qt does not provide mkspec for libc++.
-## Their support of it is quite recent and they claim they don't use it by default
-## [only because it produces bigger binary objects](https://bugreports.qt.io/browse/QTBUG-50724).
-
-#Create new mkspec for clang + libc++
-RUN cp -r qt5/qtbase/mkspecs/android-clang qt5/qtbase/mkspecs/android-clang-libc \
-    && cd qt5/qtbase/mkspecs/android-clang-libc \
-    && sed -i '16i ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH' qmake.conf \
-    && sed -i '17i ANDROID_SOURCES_CXX_STL_INCDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/include' qmake.conf \
-    && echo "QMAKE_LIBS_PRIVATE      = -lc++_shared -llog -lz -lm -ldl -lc -lgcc " >> qmake.conf \
-    && echo "QMAKE_CFLAGS -= -mfpu=vfp " >> qmake.conf \
-    && echo "QMAKE_CXXFLAGS -= -mfpu=vfp " >> qmake.conf \ 
-    && echo "QMAKE_CFLAGS += -mfpu=vfp4 " >> qmake.conf \
-    && echo "QMAKE_CXXFLAGS += -mfpu=vfp4 " >> qmake.conf 
-
-ENV ANDROID_API android-21
-    
-#ANDROID SDK TOOLS
-RUN echo y | $ANDROID_SDK_ROOT/tools/android update sdk --no-ui --all --filter platform-tools 
-RUN echo y | $ANDROID_SDK_ROOT/tools/android update sdk --no-ui --all --filter ${ANDROID_API}
-RUN echo y | $ANDROID_SDK_ROOT/tools/android update sdk --no-ui --all --filter build-tools-25.0.1 
-
-ENV CLEAN_PATH $JAVA_HOME/bin:/usr/cmake-3.6.3-Linux-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-#build Qt
-RUN cd qt5 && PATH=${CLEAN_PATH} ./configure -developer-build -release \
-    -xplatform android-clang-libc \
-    -android-ndk-platform ${ANDROID_API} \
-    -android-ndk $ANDROID_NDK_ROOT \
-    -android-sdk $ANDROID_SDK_ROOT \
-    -opensource -confirm-license \
-    -prefix ${WORKDIR}/Qt-${QT_VERSION} \
-    -nomake tests -nomake examples \
-    -skip qtserialport \
-    -skip qtconnectivity \
-    -skip qttranslations \
-    -skip qtgamepad -skip qtscript -skip qtdoc
-
-# build Qt tools : gnustl_shared.so is hard-coded in androiddeployqt
-# replace it with libc++_shared.so
-COPY androiddeployqt.patch qt5/qttools/androiddeployqt.patch
-RUN cd qt5/qttools \
-    && git apply androiddeployqt.patch \
-    && cd .. \
-    && PATH=${CLEAN_PATH} make -j4 \
-    && PATH=${CLEAN_PATH} make install
-
-# Get iconv and ZBar
-ENV ICONV_VERSION 1.14
-RUN git clone https://github.com/ZBar/ZBar.git \
-    && curl -s -O http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz \
-    && tar -xzf libiconv-${ICONV_VERSION}.tar.gz \
-    && cd libiconv-${ICONV_VERSION} \
-    && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ ./configure --build=x86_64-linux-gnu --host=arm-eabi --prefix=${WORKDIR}/libiconv --disable-rpath
-
-ENV PATH $ANDROID_SDK_ROOT/tools:$ANDROID_SDK_ROOT/platform-tools:${WORKDIR}/Qt-${QT_VERSION}/bin:$PATH
-
-#Build libiconv.a and libzbarjni.a
-COPY android.mk.patch ZBar/android.mk.patch
-RUN cd ZBar \
-    && git apply android.mk.patch \
-    && echo \
-"APP_ABI := armeabi-v7a \n\
-APP_STL := c++_shared \n\
-TARGET_PLATFORM := ${ANDROID_API} \n\
-TARGET_ARCH_ABI := armeabi-v7a \n\
-APP_CFLAGS +=  -target armv7-none-linux-androideabi -fexceptions -fstack-protector-strong -fno-limit-debug-info -mfloat-abi=softfp -mfpu=vfp -fno-builtin-memmove -fno-omit-frame-pointer -fno-stack-protector\n"\
-        >> android/jni/Application.mk \
-    && cd android \
-    && android update project --path . -t "${ANDROID_API}" \
-    && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ ant -Dndk.dir=${ANDROID_NDK_ROOT} -Diconv.src=${WORKDIR}/libiconv-${ICONV_VERSION} zbar-clean zbar-ndk-build
-
-RUN cp openssl/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib
-RUN cp boost_${BOOST_VERSION}/android32/lib/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib
-RUN cp ZBar/android/obj/local/armeabi-v7a/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib
-
-RUN git clone https://github.com/monero-project/monero-gui.git \
-    && cd monero-gui \
-    && git submodule update \
-    && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ BOOST_ROOT=/opt/android/boost_1_62_0 \
-         BOOST_LIBRARYDIR=${WORKDIR}/boost_${BOOST_VERSION}/android32/lib/ \
-         OPENSSL_ROOT_DIR=${WORKDIR}/openssl/ \
-         CMAKE_INCLUDE_PATH=${WORKDIR}/cppzmq/ \
-         CMAKE_LIBRARY_PATH=${WORKDIR}/zeromq4-1/.libs \
-         CXXFLAGS="-I ${WORKDIR}/zeromq4-1/include/" \
-         ./build.sh release-android \
-    && cd build \
-    && make deploy
-

android/docker/android.mk.patch

@@ -1,61 +0,0 @@
-diff --git a/android/jni/Android.mk b/android/jni/Android.mk
-index e442b07..158afd5 100644
---- a/android/jni/Android.mk
-+++ b/android/jni/Android.mk
-@@ -12,14 +12,18 @@ LOCAL_PATH := $(ICONV_SRC)
- 
- LOCAL_MODULE := libiconv
- 
-+LOCAL_ARM_MODE := arm
-+LOCAL_CPP_FEATURES := exceptions rtti features
- LOCAL_CFLAGS := \
-     -Wno-multichar \
-     -D_ANDROID \
--    -DLIBDIR="c" \
-+    -DLIBDIR="\".\"" \
-     -DBUILDING_LIBICONV \
-     -DBUILDING_LIBCHARSET \
-     -DIN_LIBRARY
- 
-+LOCAL_CFLAGS += -fno-stack-protector
-+
- LOCAL_SRC_FILES := \
- 	lib/iconv.c \
- 	libcharset/lib/localcharset.c \
-@@ -30,13 +34,14 @@ LOCAL_C_INCLUDES := \
- 	$(ICONV_SRC)/libcharset \
- 	$(ICONV_SRC)/libcharset/include
- 
--include $(BUILD_SHARED_LIBRARY)
-+include $(BUILD_STATIC_LIBRARY)
- 
- LOCAL_LDLIBS := -llog -lcharset
- 
- # libzbarjni
- include $(CLEAR_VARS)
- 
-+
- LOCAL_PATH := $(MY_LOCAL_PATH)
- LOCAL_MODULE := zbarjni
- LOCAL_SRC_FILES := ../../java/zbarjni.c \
-@@ -71,6 +76,17 @@ LOCAL_C_INCLUDES := ../include \
- 		    ../zbar \
- 		    $(ICONV_SRC)/include 
- 
--LOCAL_SHARED_LIBRARIES := libiconv
-+LOCAL_STATIC_LIBRARIES := libiconv
-+LOCAL_ARM_MODE := arm
-+LOCAL_CPP_FEATURES := exceptions rtti features
-+
-+LOCAL_CFLAGS := \
-+    -Wno-multichar \
-+    -D_ANDROID \
-+    -DLIBDIR="\".\"" \
-+    -DBUILDING_LIBICONV \
-+    -DBUILDING_LIBCHARSET \
-+    -DIN_LIBRARY
-+
- 
--include $(BUILD_SHARED_LIBRARY)
-\ No newline at end of file
-+include $(BUILD_STATIC_LIBRARY)

android/docker/androiddeployqt.patch

@@ -1,62 +0,0 @@
-diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
-index 8a8e591..71d693e 100644
---- a/src/androiddeployqt/main.cpp
-+++ b/src/androiddeployqt/main.cpp
-@@ -1122,7 +1122,7 @@ bool updateLibsXml(const Options &options)
- 
-     QString libsPath = QLatin1String("libs/") + options.architecture + QLatin1Char('/');
- 
--    QString qtLibs = QLatin1String("<item>gnustl_shared</item>\n");
-+    QString qtLibs = QLatin1String("<item>c++_shared</item>\n");
-     QString bundledInLibs;
-     QString bundledInAssets;
-     foreach (Options::BundledFile bundledFile, options.bundledFiles) {
-@@ -2519,6 +2519,39 @@ bool installApk(const Options &options)
-     return true;
- }
- 
-+bool copyStl(Options *options)
-+{
-+    if (options->deploymentMechanism == Options::Debug && !options->installApk)
-+        return true;
-+
-+    if (options->verbose)
-+        fprintf(stdout, "Copying LIBC++ STL library\n");
-+
-+    QString filePath = options->ndkPath
-+            + QLatin1String("/sources/cxx-stl/llvm-libc++")
-+            + QLatin1String("/libs/")
-+            + options->architecture
-+            + QLatin1String("/libc++_shared.so");
-+    if (!QFile::exists(filePath)) {
-+        fprintf(stderr, "LIBC STL library does not exist at %s\n", qPrintable(filePath));
-+        return false;
-+    }
-+
-+    QString destinationDirectory =
-+            options->deploymentMechanism == Options::Debug
-+            ? options->temporaryDirectoryName + QLatin1String("/lib")
-+            : options->outputDirectory + QLatin1String("/libs/") + options->architecture;
-+
-+    if (!copyFileIfNewer(filePath, destinationDirectory
-+                                   + QLatin1String("/libc++_shared.so"), options->verbose)) {
-+        return false;
-+    }
-+
-+    if (options->deploymentMechanism == Options::Debug && !deployToLocalTmp(options, QLatin1String("/lib/libc++_shared.so")))
-+        return false;
-+
-+    return true;
-+}
- bool copyGnuStl(Options *options)
- {
-     if (options->deploymentMechanism == Options::Debug && !options->installApk)
-@@ -2870,7 +2903,7 @@ int main(int argc, char *argv[])
-     if (Q_UNLIKELY(options.timing))
-         fprintf(stdout, "[TIMING] %d ms: Read dependencies\n", options.timer.elapsed());
- 
--    if (options.deploymentMechanism != Options::Ministro && !copyGnuStl(&options))
-+    if (options.deploymentMechanism != Options::Ministro && !copyStl(&options))
-         return CannotCopyGnuStl;
- 
-     if (Q_UNLIKELY(options.timing))

build.sh

@@ -1,121 +0,0 @@
-#!/bin/bash
-
-BUILD_TYPE=$1
-BUILD_TREZOR=${BUILD_TREZOR-true}
-source ./utils.sh
-platform=$(get_platform)
-# default build type
-if [ -z $BUILD_TYPE ]; then
-    BUILD_TYPE=release
-fi
-
-# Return 0 if the command exists, 1 if it does not.
-exists() {
-    command -v "$1" &>/dev/null
-}
-
-# Return the first value in $@ that's a runnable command.
-find_command() {
-    for arg in "$@"; do
-        if exists "$arg"; then
-           echo "$arg"
-           return 0
-        fi
-    done
-    return 1
-}
-
-if [ "$BUILD_TYPE" == "release" ]; then
-    echo "Building release"
-    CONFIG="CONFIG+=release";
-    BIN_PATH=release/bin
-elif [ "$BUILD_TYPE" == "release-static" ]; then
-    echo "Building release-static"
-    if [ "$platform" != "darwin" ]; then
-	    CONFIG="CONFIG+=release static";
-    else
-        # OS X: build static libwallet but dynamic Qt. 
-        echo "OS X: Building Qt project without static flag"
-        CONFIG="CONFIG+=release";
-    fi    
-    BIN_PATH=release/bin
-elif [ "$BUILD_TYPE" == "release-android" ]; then
-    echo "Building release for ANDROID"
-    CONFIG="CONFIG+=release static WITH_SCANNER DISABLE_PASS_STRENGTH_METER";
-    ANDROID=true
-    BIN_PATH=release/bin
-    DISABLE_PASS_STRENGTH_METER=true
-elif [ "$BUILD_TYPE" == "debug-android" ]; then
-    echo "Building debug for ANDROID : ultra INSECURE !!"
-    CONFIG="CONFIG+=debug qml_debug WITH_SCANNER DISABLE_PASS_STRENGTH_METER";
-    ANDROID=true
-    BIN_PATH=debug/bin
-    DISABLE_PASS_STRENGTH_METER=true
-elif [ "$BUILD_TYPE" == "debug" ]; then
-    echo "Building debug"
-	CONFIG="CONFIG+=debug"
-    BIN_PATH=debug/bin
-else
-    echo "Valid build types are release, release-static, release-android, debug-android and debug"
-    exit 1;
-fi
-
-
-source ./utils.sh
-pushd $(pwd)
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-MONERO_DIR=monero
-MONEROD_EXEC=monerod
-
-MAKE='make'
-if [[ $platform == *bsd* ]]; then
-    MAKE='gmake'
-fi
-
-# build libwallet
-export BUILD_TREZOR
-./get_libwallet_api.sh $BUILD_TYPE
- 
-# build zxcvbn
-if [ "$DISABLE_PASS_STRENGTH_METER" != true ]; then
-    $MAKE -C src/zxcvbn-c || exit
-fi
-
-if [ ! -d build ]; then mkdir build; fi
-
-
-# Platform indepenent settings
-if [ "$ANDROID" != true ] && ([ "$platform" == "linux32" ] || [ "$platform" == "linux64" ]); then
-    exists lsb_release && distro="$(lsb_release -is)"
-    if [ "$distro" = "Ubuntu" ] || [ "$distro" = "Fedora" ] || test -f /etc/fedora-release; then
-        CONFIG="$CONFIG libunwind_off"
-    fi
-fi
-
-if [ "$platform" == "darwin" ]; then
-    BIN_PATH=$BIN_PATH/monero-wallet-gui.app/Contents/MacOS/
-elif [ "$platform" == "mingw64" ] || [ "$platform" == "mingw32" ]; then
-    MONEROD_EXEC=monerod.exe
-fi
-
-# force version update
-get_tag
-GUI_VERSION=$(echo "$TAGNAME" | sed 's/^v\([[:digit:]]\)/\1/')
-echo "var GUI_VERSION = \"$GUI_VERSION\"" > version.js
-
-cd build
-if ! QMAKE=$(find_command qmake qmake-qt5); then
-    echo "Failed to find suitable qmake command."
-    exit 1
-fi
-$QMAKE ../monero-wallet-gui.pro "$CONFIG" || exit
-$MAKE || exit 
-
-# Copy monerod to bin folder
-if [ "$platform" != "mingw32" ] && [ "$ANDROID" != true ]; then
-cp ../$MONERO_DIR/bin/$MONEROD_EXEC $BIN_PATH
-fi
-
-# make deploy
-popd
-

cmake/Deploy.cmake

@@ -17,11 +17,7 @@ if(APPLE OR (WIN32 AND NOT STATIC))
             add_custom_command(TARGET deploy
                                POST_BUILD
                                COMMAND ${CMAKE_COMMAND} -E copy ${_qt_svg_dylib} $<TARGET_FILE_DIR:monero-wallet-gui>/../PlugIns/imageformats/
-                               COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtGui.framework/Versions/5/QtGui" "@executable_path/../Frameworks/QtGui.fr    amework/Versions/5/QtGui" $<TARGET_FILE_DIR:monero-wallet-gui>/../PlugIns/imageformats/libqsvg.dylib
-                               COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtWidgets.framework/Versions/5/QtWidgets" "@executable_path/../Frameworks/    QtGui.framework/Versions/5/QtGui" $<TARGET_FILE_DIR:monero-wallet-gui>/../PlugIns/imageformats/libqsvg.dylib
-                               COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtSvg.framework/Versions/5/QtSvg" "@executable_path/../Frameworks/QtGui.fr    amework/Versions/5/QtGui" $<TARGET_FILE_DIR:monero-wallet-gui>/../PlugIns/imageformats/libqsvg.dylib
-                               COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "${CMAKE_PREFIX_PATH}/lib/QtCore.framework/Versions/5/QtCore" "@executable_path/../Frameworks/QtGui.    framework/Versions/5/QtGui" $<TARGET_FILE_DIR:monero-wallet-gui>/../PlugIns/imageformats/libqsvg.dylib
-                               COMMENT "Copying libqsvg.dylib, running install_name_tool"
+                               COMMENT "Copying libqsvg.dylib"
             )
         endif()
 
@@ -78,19 +74,19 @@ if(APPLE OR (WIN32 AND NOT STATIC))
         )
         if(CMAKE_BUILD_TYPE STREQUAL "Debug")
             list(APPEND WIN_DEPLOY_DLLS
-                libicudtd67.dll
-                libicuind67.dll
-                libicuiod67.dll
-                libicutud67.dll
-                libicuucd67.dll
+                libicudtd71.dll
+                libicuind71.dll
+                libicuiod71.dll
+                libicutud71.dll
+                libicuucd71.dll
             )
         else() # assume release
             list(APPEND WIN_DEPLOY_DLLS
-                libicudt67.dll
-                libicuin67.dll
-                libicuio67.dll
-                libicutu67.dll
-                libicuuc67.dll
+                libicudt71.dll
+                libicuin71.dll
+                libicuio71.dll
+                libicutu71.dll
+                libicuuc71.dll
             )
         endif()
         list(TRANSFORM WIN_DEPLOY_DLLS PREPEND "$ENV{MSYSTEM_PREFIX}/bin/")

cmake/Doxygen.extra.css.in

@@ -1,14 +0,0 @@
-/* increase vertical space */
-#titlearea, #nav-path {
-    display: none;
-    height: 0px;
-}
-
-
-/* uncomment these lines for some extra vertical space */
-
-/*
-.tablist li {
-    line-height: 26px;
-}
-*/

cmake/FindBacktrace.cmake

@@ -1,98 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#.rst:
-# FindBacktrace
-# -------------
-#
-# Find provider for backtrace(3).
-#
-# Checks if OS supports backtrace(3) via either libc or custom library.
-# This module defines the following variables:
-#
-# ``Backtrace_HEADER``
-#   The header file needed for backtrace(3). Cached.
-#   Could be forcibly set by user.
-# ``Backtrace_INCLUDE_DIRS``
-#   The include directories needed to use backtrace(3) header.
-# ``Backtrace_LIBRARIES``
-#   The libraries (linker flags) needed to use backtrace(3), if any.
-# ``Backtrace_FOUND``
-#   Is set if and only if backtrace(3) support detected.
-#
-# The following cache variables are also available to set or use:
-#
-# ``Backtrace_LIBRARY``
-#   The external library providing backtrace, if any.
-# ``Backtrace_INCLUDE_DIR``
-#   The directory holding the backtrace(3) header.
-#
-# Typical usage is to generate of header file using configure_file() with the
-# contents like the following::
-#
-#  #cmakedefine01 Backtrace_FOUND
-#  #if Backtrace_FOUND
-#  # include <${Backtrace_HEADER}>
-#  #endif
-#
-# And then reference that generated header file in actual source.
-
-include(CMakePushCheckState)
-include(CheckSymbolExists)
-include(FindPackageHandleStandardArgs)
-
-# List of variables to be provided to find_package_handle_standard_args()
-set(_Backtrace_STD_ARGS Backtrace_INCLUDE_DIR)
-
-if(Backtrace_HEADER)
-  set(_Backtrace_HEADER_TRY "${Backtrace_HEADER}")
-else(Backtrace_HEADER)
-  set(_Backtrace_HEADER_TRY "execinfo.h")
-endif(Backtrace_HEADER)
-
-find_path(Backtrace_INCLUDE_DIR "${_Backtrace_HEADER_TRY}")
-set(Backtrace_INCLUDE_DIRS ${Backtrace_INCLUDE_DIR})
-
-if (NOT DEFINED Backtrace_LIBRARY)
-  # First, check if we already have backtrace(), e.g., in libc
-  cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_INCLUDES ${Backtrace_INCLUDE_DIRS})
-  set(CMAKE_REQUIRED_QUIET ${Backtrace_FIND_QUIETLY})
-  check_symbol_exists("backtrace" "${_Backtrace_HEADER_TRY}" _Backtrace_SYM_FOUND)
-  cmake_pop_check_state()
-endif()
-
-if(_Backtrace_SYM_FOUND)
-  # Avoid repeating the message() call below each time CMake is run.
-  if(NOT Backtrace_FIND_QUIETLY AND NOT DEFINED Backtrace_LIBRARY)
-    message(STATUS "backtrace facility detected in default set of libraries")
-  endif()
-  set(Backtrace_LIBRARY "" CACHE FILEPATH "Library providing backtrace(3), empty for default set of libraries")
-else()
-  # Check for external library, for non-glibc systems
-  if(Backtrace_INCLUDE_DIR)
-    # OpenBSD has libbacktrace renamed to libexecinfo
-    find_library(Backtrace_LIBRARY "execinfo")
-  elseif()     # respect user wishes
-    set(_Backtrace_HEADER_TRY "backtrace.h")
-    find_path(Backtrace_INCLUDE_DIR ${_Backtrace_HEADER_TRY})
-    find_library(Backtrace_LIBRARY "backtrace")
-  endif()
-
-  # Prepend list with library path as it's more common practice
-  set(_Backtrace_STD_ARGS Backtrace_LIBRARY ${_Backtrace_STD_ARGS})
-endif()
-
-message(STATUS "Backtrace_LIBRARY: ${Backtrace_LIBRARY}")
-if(Backtrace_LIBRARY STREQUAL "NOTFOUND")
-  set(Backtrace_LIBRARY "")
-endif()
-if(Backtrace_LIBRARY STREQUAL "Backtrace_LIBRARY-NOTFOUND")
-  set(Backtrace_LIBRARY "")
-endif()
-
-set(Backtrace_LIBRARIES ${Backtrace_LIBRARY})
-set(Backtrace_HEADER "${_Backtrace_HEADER_TRY}" CACHE STRING "Header providing backtrace(3) facility")
-
-find_package_handle_standard_args(Backtrace FOUND_VAR Backtrace_FOUND REQUIRED_VARS ${_Backtrace_STD_ARGS})
-mark_as_advanced(Backtrace_HEADER Backtrace_INCLUDE_DIR Backtrace_LIBRARY)

cmake/FindBerkeleyDB.cmake

@@ -1,25 +0,0 @@
-# - Try to find Berkeley DB
-# Once done this will define
-#
-#  BERKELEY_DB_FOUND - system has Berkeley DB
-#  BERKELEY_DB_INCLUDE_DIR - the Berkeley DB include directory
-#  BERKELEY_DB_LIBRARIES - Link these to use Berkeley DB
-#  BERKELEY_DB_DEFINITIONS - Compiler switches required for using Berkeley DB
-
-# Copyright (c) 2006, Alexander Dymo, <adymo@kdevelop.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-find_path(BERKELEY_DB_INCLUDE_DIR db_cxx.h
-  /usr/include/db4
-  /usr/local/include/db4
-)
-
-find_library(BERKELEY_DB_LIBRARIES NAMES db_cxx )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Berkeley "Could not find Berkeley DB >= 4.1" BERKELEY_DB_INCLUDE_DIR BERKELEY_DB_LIBRARIES)
-# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
-mark_as_advanced(BERKELEY_DB_INCLUDE_DIR BERKELEY_DB_LIBRARIES )
-

cmake/FindCcache.cmake

@@ -1,56 +0,0 @@
-# Copyright (c) 2014-2020, The Monero Project
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# - Try to find readline include dirs and libraries
-#
-# Automatically finds ccache build accelerator, if it's found in PATH.
-#
-# Usage of this module as follows:
-#
-#     project(monero)
-#     include(FindCcache) # Include AFTER the project() macro to be able to reach the CMAKE_CXX_COMPILER variable
-#
-# Properties modified by this module:
-#
-#  GLOBAL PROPERTY RULE_LAUNCH_COMPILE     set to ccache, when ccache found
-#  GLOBAL PROPERTY RULE_LAUNCH_LINK        set to ccache, when ccache found
-
-find_program(CCACHE_FOUND ccache)
-if (CCACHE_FOUND)
-	set(TEMP_CPP_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test-program.cpp")
-	file(WRITE "${TEMP_CPP_FILE}" "int main() { return 0; }")
-	execute_process(COMMAND "${CCACHE_FOUND}" "${CMAKE_CXX_COMPILER}" "${TEMP_CPP_FILE}"  RESULT_VARIABLE RET)
-	if (${RET} EQUAL 0)
-		message("found usable ccache: ${CCACHE_FOUND}")
-		set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_FOUND}")
-		set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK    "${CCACHE_FOUND}")
-	else()
-		message("found ccache ${CCACHE_FOUND}, but is UNUSABLE! Return code: ${RET}")
-	endif()
-else()
-	message("ccache NOT found!")
-endif()

cmake/FindHIDAPI.cmake

@@ -1,60 +0,0 @@
-# - try to find HIDAPI library
-# from http://www.signal11.us/oss/hidapi/
-#
-# Cache Variables: (probably not for direct use in your scripts)
-#  HIDAPI_INCLUDE_DIR
-#  HIDAPI_LIBRARY
-#
-# Non-cache variables you might use in your CMakeLists.txt:
-#  HIDAPI_FOUND
-#  HIDAPI_INCLUDE_DIRS
-#  HIDAPI_LIBRARIES
-#
-# Requires these CMake modules:
-#  FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-find_library(HIDAPI_LIBRARY
-  NAMES hidapi hidapi-libusb)
-
-find_path(HIDAPI_INCLUDE_DIR
-  NAMES hidapi.h
-  PATH_SUFFIXES
-  hidapi)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(HIDAPI
-  DEFAULT_MSG
-  HIDAPI_LIBRARY
-  HIDAPI_INCLUDE_DIR)
-
-if(HIDAPI_FOUND)
-  set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARY}")
-  if((STATIC AND UNIX AND NOT APPLE) OR (DEPENDS AND CMAKE_SYSTEM_NAME STREQUAL "Linux"))
-    find_library(LIBUSB-1.0_LIBRARY usb-1.0)
-    find_library(LIBUDEV_LIBRARY udev)
-    if(LIBUSB-1.0_LIBRARY)
-      set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARIES};${LIBUSB-1.0_LIBRARY}")
-      if(LIBUDEV_LIBRARY)
-        set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARIES};${LIBUDEV_LIBRARY}")
-      else()
-        message(WARNING "libudev library not found, binaries may fail to link.")
-      endif()
-    else()
-      message(WARNING "libusb-1.0 library not found, binaries may fail to link.")
-    endif()
-  endif()
-
-  set(HIDAPI_INCLUDE_DIRS "${HIDAPI_INCLUDE_DIR}")
-endif()
-
-mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_LIBRARY)

cmake/FindLibUSB.cmake

@@ -1,149 +0,0 @@
-# - Find libusb for portable USB support
-# This module will find libusb as published by
-#  http://libusb.sf.net and
-#  http://libusb-win32.sf.net
-#
-# It will use PkgConfig if present and supported, else search
-# it on its own. If the LibUSB_ROOT_DIR environment variable
-# is defined, it will be used as base path.
-# The following standard variables get defined:
-#  LibUSB_FOUND:        true if LibUSB was found
-#  LibUSB_HEADER_FILE:  the location of the C header file
-#  LibUSB_INCLUDE_DIRS: the directory that contains the include file
-#  LibUSB_LIBRARIES:    the library
-# source: https://github.com/IntelRealSense/librealsense
-
-include ( CheckLibraryExists )
-include ( CheckIncludeFile )
-
-find_package ( PkgConfig )
-if ( PKG_CONFIG_FOUND )
-    pkg_check_modules ( PKGCONFIG_LIBUSB libusb-1.0 )
-    if ( NOT PKGCONFIG_LIBUSB_FOUND )
-        pkg_check_modules ( PKGCONFIG_LIBUSB libusb )
-    endif ( NOT PKGCONFIG_LIBUSB_FOUND )
-endif ( PKG_CONFIG_FOUND )
-
-if ( PKGCONFIG_LIBUSB_FOUND )
-    set ( LibUSB_INCLUDE_DIRS ${PKGCONFIG_LIBUSB_INCLUDE_DIRS} )
-    foreach ( i ${PKGCONFIG_LIBUSB_LIBRARIES} )
-        string ( REGEX MATCH "[^-]*" ibase "${i}" )
-        find_library ( ${ibase}_LIBRARY
-                NAMES ${i}
-                PATHS ${PKGCONFIG_LIBUSB_LIBRARY_DIRS}
-                )
-        if ( ${ibase}_LIBRARY )
-            list ( APPEND LibUSB_LIBRARIES ${${ibase}_LIBRARY} )
-        endif ( ${ibase}_LIBRARY )
-        mark_as_advanced ( ${ibase}_LIBRARY )
-    endforeach ( i )
-
-else ( PKGCONFIG_LIBUSB_FOUND )
-    find_file ( LibUSB_HEADER_FILE
-            NAMES
-            libusb.h usb.h
-            PATHS
-            $ENV{ProgramFiles}/LibUSB-Win32
-            $ENV{LibUSB_ROOT_DIR}
-            PATH_SUFFIXES
-            include
-            libusb-1.0
-            include/libusb-1.0
-            )
-    mark_as_advanced ( LibUSB_HEADER_FILE )
-    get_filename_component ( LibUSB_INCLUDE_DIRS "${LibUSB_HEADER_FILE}" PATH )
-
-    if ( ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" )
-        # LibUSB-Win32 binary distribution contains several libs.
-        # Use the lib that got compiled with the same compiler.
-        if ( MSVC )
-            if ( WIN32 )
-                set ( LibUSB_LIBRARY_PATH_SUFFIX lib/msvc )
-            else ( WIN32 )
-                set ( LibUSB_LIBRARY_PATH_SUFFIX lib/msvc_x64 )
-            endif ( WIN32 )
-        elseif ( BORLAND )
-            set ( LibUSB_LIBRARY_PATH_SUFFIX lib/bcc )
-        elseif ( CMAKE_COMPILER_IS_GNUCC )
-            set ( LibUSB_LIBRARY_PATH_SUFFIX lib/gcc )
-        endif ( MSVC )
-    endif ( ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" )
-
-    find_library ( usb_LIBRARY
-            NAMES
-            usb-1.0 libusb usb
-            PATHS
-            $ENV{ProgramFiles}/LibUSB-Win32
-            $ENV{LibUSB_ROOT_DIR}
-            PATH_SUFFIXES
-            ${LibUSB_LIBRARY_PATH_SUFFIX}
-            )
-    mark_as_advanced ( usb_LIBRARY )
-    if ( usb_LIBRARY )
-        set ( LibUSB_LIBRARIES ${usb_LIBRARY} )
-    endif ( usb_LIBRARY )
-
-endif ( PKGCONFIG_LIBUSB_FOUND )
-
-if ( LibUSB_INCLUDE_DIRS AND LibUSB_LIBRARIES )
-    set ( LibUSB_FOUND true )
-endif ( LibUSB_INCLUDE_DIRS AND LibUSB_LIBRARIES )
-
-if ( LibUSB_FOUND )
-    set ( CMAKE_REQUIRED_INCLUDES "${LibUSB_INCLUDE_DIRS}" )
-    check_include_file ( "${LibUSB_HEADER_FILE}" LibUSB_FOUND )
-endif ( LibUSB_FOUND )
-
-if ( LibUSB_FOUND )
-    check_library_exists ( "${LibUSB_LIBRARIES}" usb_open "" LibUSB_FOUND )
-    check_library_exists ( "${LibUSB_LIBRARIES}" libusb_get_device_list "" LibUSB_VERSION_1.0 )
-    check_library_exists ( "${LibUSB_LIBRARIES}" libusb_get_port_numbers "" LibUSB_VERSION_1.0.16 )
-
-    if((STATIC AND UNIX AND NOT APPLE) OR (DEPENDS AND CMAKE_SYSTEM_NAME STREQUAL "Linux"))
-        find_library(LIBUDEV_LIBRARY udev)
-        if(LIBUDEV_LIBRARY)
-            set(LibUSB_LIBRARIES "${LibUSB_LIBRARIES};${LIBUDEV_LIBRARY}")
-        else()
-            message(WARNING "libudev library not found, binaries may fail to link.")
-        endif()
-    endif()
-
-    # Library 1.0.16+ compilation test.
-    # The check_library_exists does not work well on Apple with shared libs.
-    if (APPLE OR LibUSB_VERSION_1.0.16 OR STATIC)
-        if (APPLE)
-            if(DEPENDS)
-                list(APPEND TEST_COMPILE_EXTRA_LIBRARIES "-framework Foundation -framework IOKit")
-            else()
-                find_library(COREFOUNDATION CoreFoundation)
-                find_library(IOKIT IOKit)
-                list(APPEND TEST_COMPILE_EXTRA_LIBRARIES ${IOKIT})
-                list(APPEND TEST_COMPILE_EXTRA_LIBRARIES ${COREFOUNDATION})
-            endif()
-        endif()
-        if (WIN32)
-            list(APPEND TEST_COMPILE_EXTRA_LIBRARIES setupapi)
-        endif()
-        list(APPEND TEST_COMPILE_EXTRA_LIBRARIES ${LibUSB_LIBRARIES})
-
-        try_compile(LibUSB_COMPILE_TEST_PASSED
-                ${CMAKE_BINARY_DIR}
-                "${CMAKE_SOURCE_DIR}/cmake/test-libusb-version.c"
-                CMAKE_FLAGS
-                    "-DINCLUDE_DIRECTORIES=${LibUSB_INCLUDE_DIRS}"
-                    "-DLINK_DIRECTORIES=${LibUSB_LIBRARIES}"
-                LINK_LIBRARIES ${TEST_COMPILE_EXTRA_LIBRARIES}
-                OUTPUT_VARIABLE OUTPUT)
-        unset(TEST_COMPILE_EXTRA_LIBRARIES)
-        message(STATUS "LibUSB Compilation test: ${LibUSB_COMPILE_TEST_PASSED}")
-    endif()
-endif ( LibUSB_FOUND )
-
-if ( NOT LibUSB_FOUND )
-    if ( NOT LibUSB_FIND_QUIETLY )
-        message ( STATUS "LibUSB not found, try setting LibUSB_ROOT_DIR environment variable." )
-    endif ( NOT LibUSB_FIND_QUIETLY )
-    if ( LibUSB_FIND_REQUIRED )
-        message ( FATAL_ERROR "" )
-    endif ( LibUSB_FIND_REQUIRED )
-endif ( NOT LibUSB_FOUND )

cmake/FindLibunwind.cmake

@@ -1,41 +0,0 @@
-# - Try to find libunwind
-# Once done this will define
-#
-#  LIBUNWIND_FOUND - system has libunwind
-#  LIBUNWIND_INCLUDE_DIR - the libunwind include directory
-#  LIBUNWIND_LIBRARIES - Link these to use libunwind
-#  LIBUNWIND_DEFINITIONS - Compiler switches required for using libunwind
-
-# Copyright (c) 2006, Alexander Dymo, <adymo@kdevelop.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-find_path(LIBUNWIND_INCLUDE_DIR libunwind.h
-  /usr/include
-  /usr/local/include
-)
-
-find_library(LIBUNWIND_LIBRARIES NAMES unwind )
-if(NOT LIBUNWIND_LIBRARIES STREQUAL "LIBUNWIND_LIBRARIES-NOTFOUND")
-  if (CMAKE_COMPILER_IS_GNUCC)
-    set(LIBUNWIND_LIBRARIES "gcc_eh;${LIBUNWIND_LIBRARIES}")
-  endif()
-endif()
-
-# some versions of libunwind need liblzma, and we don't use pkg-config
-# so we just look whether liblzma is installed, and add it if it is.
-# It might not be actually needed, but doesn't hurt if it is not.
-# We don't need any headers, just the lib, as it's privately needed.
-message(STATUS "looking for liblzma")
-find_library(LIBLZMA_LIBRARIES lzma )
-if(NOT LIBLZMA_LIBRARIES STREQUAL "LIBLZMA_LIBRARIES-NOTFOUND")
-  message(STATUS "liblzma found")
-  set(LIBUNWIND_LIBRARIES "${LIBUNWIND_LIBRARIES};${LIBLZMA_LIBRARIES}")
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libunwind "Could not find libunwind" LIBUNWIND_INCLUDE_DIR LIBUNWIND_LIBRARIES)
-# show the LIBUNWIND_INCLUDE_DIR and LIBUNWIND_LIBRARIES variables only in the advanced view
-mark_as_advanced(LIBUNWIND_INCLUDE_DIR LIBUNWIND_LIBRARIES )
-

cmake/FindMiniupnpc.cmake

@@ -1,59 +0,0 @@
-# --------------------------------- FindMiniupnpc Start ---------------------------------
-# Locate miniupnp library
-# This module defines
-#  MINIUPNP_FOUND, if false, do not try to link to miniupnp
-#  MINIUPNP_LIBRARY, the miniupnp variant
-#  MINIUPNP_INCLUDE_DIR, where to find miniupnpc.h and family)
-#  MINIUPNPC_VERSION_1_7_OR_HIGHER, set if we detect the version of miniupnpc is 1.7 or higher
-#
-# Note that the expected include convention is
-#  #include "miniupnpc.h"
-# and not
-#  #include <miniupnpc/miniupnpc.h>
-# This is because, the miniupnpc location is not standardized and may exist
-# in locations other than miniupnpc/
-
-if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
-	# Already in cache, be silent
-	set(MINIUPNP_FIND_QUIETLY TRUE)
-endif ()
-
-find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h
-  HINTS $ENV{MINIUPNP_INCLUDE_DIR}
-  PATH_SUFFIXES miniupnpc
-)
-
-find_library(MINIUPNP_LIBRARY miniupnpc
-  HINTS $ENV{MINIUPNP_LIBRARY}
-)
-
-find_library(MINIUPNP_STATIC_LIBRARY libminiupnpc.a
-  HINTS $ENV{MINIUPNP_STATIC_LIBRARY}
-)
-
-set(MINIUPNP_INCLUDE_DIRS ${MINIUPNP_INCLUDE_DIR})
-set(MINIUPNP_LIBRARIES ${MINIUPNP_LIBRARY})
-set(MINIUPNP_STATIC_LIBRARIES ${MINIUPNP_STATIC_LIBRARY})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
-  MiniUPnPc DEFAULT_MSG
-  MINIUPNP_INCLUDE_DIR
-  MINIUPNP_LIBRARY
-)
-
-IF(MINIUPNPC_FOUND)
-  file(STRINGS "${MINIUPNP_INCLUDE_DIR}/miniupnpc.h" MINIUPNPC_API_VERSION_STR REGEX "^#define[\t ]+MINIUPNPC_API_VERSION[\t ]+[0-9]+")
-  if(MINIUPNPC_API_VERSION_STR MATCHES "^#define[\t ]+MINIUPNPC_API_VERSION[\t ]+([0-9]+)")
-    set(MINIUPNPC_API_VERSION "${CMAKE_MATCH_1}")
-	if (${MINIUPNPC_API_VERSION} GREATER "10" OR ${MINIUPNPC_API_VERSION} EQUAL "10")
-		message(STATUS "Found miniupnpc API version " ${MINIUPNPC_API_VERSION})
-		set(MINIUPNP_FOUND true)
-		set(MINIUPNPC_VERSION_1_7_OR_HIGHER true)
-	endif()
-  endif()
-
-ENDIF()
-
-mark_as_advanced(MINIUPNP_INCLUDE_DIR MINIUPNP_LIBRARY MINIUPNP_STATIC_LIBRARY)
-# --------------------------------- FindMiniupnpc End ---------------------------------

cmake/FindReadline.cmake

@@ -1,91 +0,0 @@
-# - Try to find readline include dirs and libraries 
-#
-# Usage of this module as follows:
-#
-#     find_package(Readline)
-#
-# Variables used by this module, they can change the default behaviour and need
-# to be set before calling find_package:
-#
-#  Readline_ROOT_DIR         Set this variable to the root installation of
-#                            readline if the module has problems finding the
-#                            proper installation path.
-#
-# Variables defined by this module:
-#
-#  READLINE_FOUND            System has readline, include and lib dirs found
-#  GNU_READLINE_FOUND        Version of readline found is GNU readline, not libedit!
-#  LIBEDIT_FOUND             Version of readline found is libedit, not GNU readline!
-#  Readline_INCLUDE_DIR      The readline include directories. 
-#  Readline_LIBRARY          The readline library.
-#  GNU_READLINE_LIBRARY      The GNU readline library or empty string.
-#  LIBEDIT_LIBRARY           The libedit library or empty string.
-
-find_path(Readline_ROOT_DIR
-    NAMES include/readline/readline.h
-    PATHS /usr/local/opt/readline/ /opt/local/ /usr/local/ /usr/
-    NO_DEFAULT_PATH
-)
-
-find_path(Readline_INCLUDE_DIR
-    NAMES readline/readline.h
-    PATHS ${Readline_ROOT_DIR}/include
-    NO_DEFAULT_PATH
-)
-
-find_library(Readline_LIBRARY
-    NAMES readline
-    PATHS ${Readline_ROOT_DIR}/lib
-    NO_DEFAULT_PATH
-)
-
-find_library(Termcap_LIBRARY
-  NAMES tinfo termcap ncursesw ncurses cursesw curses
-)
-
-if(Readline_INCLUDE_DIR AND Readline_LIBRARY)
-  set(READLINE_FOUND TRUE)
-else(Readline_INCLUDE_DIR AND Readline_LIBRARY)
-  FIND_LIBRARY(Readline_LIBRARY NAMES readline PATHS Readline_ROOT_DIR)
-  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG Readline_INCLUDE_DIR Readline_LIBRARY )
-  MARK_AS_ADVANCED(Readline_INCLUDE_DIR Readline_LIBRARY)
-endif(Readline_INCLUDE_DIR AND Readline_LIBRARY)
-
-mark_as_advanced(
-    Readline_ROOT_DIR
-    Readline_INCLUDE_DIR
-    Readline_LIBRARY
-)
-
-set(CMAKE_REQUIRED_INCLUDES ${Readline_INCLUDE_DIR})
-set(CMAKE_REQUIRED_LIBRARIES ${Readline_LIBRARY})
-
-include(CheckFunctionExists)
-check_function_exists(rl_copy_text HAVE_COPY_TEXT)
-check_function_exists(rl_filename_completion_function HAVE_COMPLETION_FUNCTION)
-
-if(NOT HAVE_COMPLETION_FUNCTION)
-  if (Readline_LIBRARY)
-    set(CMAKE_REQUIRED_LIBRARIES ${Readline_LIBRARY} ${Termcap_LIBRARY})
-  endif(Readline_LIBRARY)
-  check_function_exists(rl_copy_text HAVE_COPY_TEXT_TC)
-  check_function_exists(rl_filename_completion_function HAVE_COMPLETION_FUNCTION_TC)
-  set(HAVE_COMPLETION_FUNCTION ${HAVE_COMPLETION_FUNCTION_TC})
-  set(HAVE_COPY_TEXT ${HAVE_COPY_TEXT_TC})
-  if(HAVE_COMPLETION_FUNCTION)
-    set(Readline_LIBRARY ${Readline_LIBRARY} ${Termcap_LIBRARY})
-  endif(HAVE_COMPLETION_FUNCTION)
-endif(NOT HAVE_COMPLETION_FUNCTION)
-
-set(LIBEDIT_LIBRARY "")
-set(GNU_READLINE_LIBRARY "")
-
-if(HAVE_COMPLETION_FUNCTION AND HAVE_COPY_TEXT)
-  set(GNU_READLINE_FOUND TRUE)
-  set(GNU_READLINE_LIBRARY ${Readline_LIBRARY})
-elseif(READLINE_FOUND AND NOT HAVE_COPY_TEXT)
-  set(LIBEDIT_FOUND TRUE)
-  set(LIBEDIT_LIBRARY ${Readline_LIBRARY})
-endif(HAVE_COMPLETION_FUNCTION AND HAVE_COPY_TEXT)
-

cmake/FindUnbound.cmake

@@ -1,40 +0,0 @@
-# Copyright (c) 2014-2019, The Monero Project
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-MESSAGE(STATUS "Looking for libunbound")
-
-FIND_PATH(UNBOUND_INCLUDE_DIR
-  NAMES unbound.h
-  PATH_SUFFIXES include/ include/unbound/
-  PATHS "${PROJECT_SOURCE_DIR}"
-  ${UNBOUND_ROOT}
-  $ENV{UNBOUND_ROOT}
-  /usr/local/
-  /usr/
-)
-
-find_library(UNBOUND_LIBRARIES unbound)

cmake/FindZBar0.cmake

@@ -1,22 +0,0 @@
-# from http://code.google.com/p/low-cost-vision-2012/source/browse/CMakeModules/FindZBar0.cmake?name=2-helium-1&r=d61f248bd5565b3c086bf4769a04bfd98f7079df
-# - Try to find ZBar
-# This will define
-#
-#  ZBAR_FOUND - 
-#  ZBAR_LIBRARY_DIR - 
-#  ZBAR_INCLUDE_DIR - 
-#  ZBAR_LIBRARIES - 
-#
-
-find_package(PkgConfig)
-pkg_check_modules(PC_ZBAR QUIET zbar)
-set(ZBAR_DEFINITIONS ${PC_ZBAR_CFLAGS_OTHER})
-find_library(ZBAR_LIBRARIES NAMES zbar 
-             HINTS ${PC_ZBAR_LIBDIR} ${PC_ZBAR_LIBRARY_DIRS} )
-find_path(ZBAR_INCLUDE_DIR Decoder.h
-          HINTS ${PC_ZBAR_INCLUDEDIR} ${PC_ZBAR_INCLUDE_DIRS}
-          PATH_SUFFIXES zbar )
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(ZBAR  DEFAULT_MSG  ZBAR_LIBRARIES ZBAR_INCLUDE_DIR)
-message(STATUS "Found zbar libraries ${ZBAR_LIBRARIES}")
-

cmake/GenVersion.cmake

@@ -1,68 +0,0 @@
-# Copyright (c) 2014-2019, The Monero Project
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
-
-# Check what commit we're on
-execute_process(COMMAND "${GIT}" rev-parse --short=9 HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-if(RET)
-	# Something went wrong, set the version tag to -unknown
-	
-    message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.")
-    set(VERSIONTAG "unknown")
-    set(VERSION_IS_RELEASE "false")
-    configure_file("monero/src/version.cpp.in" "${TO}")
-else()
-	string(SUBSTRING ${COMMIT} 0 9 COMMIT)
-	message(STATUS "You are currently on commit ${COMMIT}")
-	
-	# Get all the tags
-	execute_process(COMMAND "${GIT}" rev-list --tags --max-count=1 --abbrev-commit RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
-	
-    if(NOT TAGGEDCOMMIT)
-        message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.")
-        set(VERSIONTAG "${COMMIT}")
-        set(VERSION_IS_RELEASE "false")
-    else()
-        message(STATUS "The most recent tag was at ${TAGGEDCOMMIT}")
-        
-        # Check if we're building that tagged commit or a different one
-        if(COMMIT STREQUAL TAGGEDCOMMIT)
-            message(STATUS "You are building a tagged release")
-            set(VERSIONTAG "release")
-            set(VERSION_IS_RELEASE "true")
-        else()
-            message(STATUS "You are ahead of or behind a tagged release")
-            set(VERSIONTAG "${COMMIT}")
-            set(VERSION_IS_RELEASE "false")
-        endif()
-    endif()	    
-
-    configure_file("monero/src/version.cpp.in" "${TO}")
-endif()

cmake/GitGetVersionTag.cmake

@@ -1,67 +0,0 @@
-# Copyright (c) 2014-2019, The Monero Project
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
-
-function (git_get_version_tag git directory result_var)
-  execute_process(COMMAND "${git}" rev-parse --short HEAD
-    WORKING_DIRECTORY ${directory}
-    OUTPUT_VARIABLE COMMIT
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if(NOT COMMIT)
-    message(WARNING "${directory}: cannot determine current commit. Make sure that you are building from a Git working tree")
-    set(${result_var} "unknown" PARENT_SCOPE)
-    return()
-  endif()
-
-  execute_process(COMMAND "${git}" describe --tags --exact-match
-    WORKING_DIRECTORY ${directory}
-    OUTPUT_VARIABLE TAG
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if(TAG)
-    message(STATUS "${directory}: building tagged release ${TAG}-${COMMIT}")
-    set(${result_var} "${TAG}-${COMMIT}" PARENT_SCOPE)
-    return()
-  endif()
-
-  execute_process(COMMAND "${git}" describe --tags --long
-    WORKING_DIRECTORY ${directory}
-    OUTPUT_VARIABLE MOST_RECENT_TAG
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if(MOST_RECENT_TAG)
-    message(STATUS "${directory}: ahead of or behind a tagged release, building ${MOST_RECENT_TAG}")
-    set(${result_var} "${MOST_RECENT_TAG}" PARENT_SCOPE)
-    return()
-  endif()
-
-  message(STATUS "${directory}: building ${COMMIT} commit")
-  set(${result_var} "${COMMIT}" PARENT_SCOPE)
-endfunction()

cmake/Version.cmake

@@ -1,81 +0,0 @@
-# Copyright (c) 2014-2017, The Monero Project
-# 
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without modification, are
-# permitted provided that the following conditions are met:
-# 
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-# 
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other
-#    materials provided with the distribution.
-# 
-# 3. Neither the name of the copyright holder nor the names of its contributors may be
-#    used to endorse or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-function (write_static_version_header hash)
-  set(VERSIONTAG "${hash}")
-  configure_file("${CMAKE_SOURCE_DIR}/monero/src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp")
-endfunction ()
-
-find_package(Git QUIET)
-if ("$Format:$" STREQUAL "")
-  # We're in a tarball; use hard-coded variables.
-  write_static_version_header("release")
-elseif (GIT_FOUND OR Git_FOUND)
-  add_custom_command(
-    OUTPUT            "${CMAKE_BINARY_DIR}/version.cpp"
-    COMMAND           "${CMAKE_COMMAND}"
-                      "-D" "GIT=${GIT_EXECUTABLE}"
-                      "-D" "TO=${CMAKE_BINARY_DIR}/version.cpp"
-                      "-P" "cmake/GenVersion.cmake"
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
-
-  #message(STATUS "Found Git: ${GIT_EXECUTABLE}")
-  #    COMMAND           "${CMAKE_COMMAND}"
-  #                    "-D" "GIT=${GIT_EXECUTABLE}"
-  #                    "-D" "TO=${CMAKE_BINARY_DIR}/monero/version.cpp"
-  #                    "-P" "cmake/GenVersion.cmake"
-  #  BYPRODUCTS        "${CMAKE_BINARY_DIR}/monero/version.cpp"
-  #  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
-else()
-  message(STATUS "WARNING: Git was not found!")
-  write_static_version_header("unknown")
-endif ()
-add_custom_target(genversion ALL
-  DEPENDS "${CMAKE_BINARY_DIR}/version.cpp")
-
-
-#find_package(Git QUIET)
-#if ("$Format:$" STREQUAL "")
-#  # We're in a tarball; use hard-coded variables.
-#  write_static_version_header("release")
-#elseif (GIT_FOUND OR Git_FOUND)
-#  message(STATUS "Found Git: ${GIT_EXECUTABLE}")
-#  add_custom_command(
-#    OUTPUT            "${CMAKE_BINARY_DIR}/version.cpp"
-#    COMMAND           "${CMAKE_COMMAND}"
-#                      "-D" "GIT=${GIT_EXECUTABLE}"
-#                      "-D" "TO=${CMAKE_BINARY_DIR}/version.cpp"
-#                      "-P" "cmake/GenVersion.cmake"
-#    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
-#else()
-#  message(STATUS "WARNING: Git was not found!")
-#  write_static_version_header("unknown")
-#endif ()
-#add_custom_target(genversion ALL
-#  DEPENDS "${CMAKE_BINARY_DIR}/version.cpp")
-

cmake/VersionGui.cmake

@@ -26,7 +26,8 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-function (write_static_version_header VERSION_TAG_GUI)
+function (write_static_version_header tag)
+    set(VERSION_TAG_GUI "${tag}" CACHE STRING "The tag portion of the Monero GUI software version" FORCE)
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/version.js.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.js")
 endfunction ()
 
@@ -36,11 +37,8 @@ if ("$Format:$" STREQUAL "")
   write_static_version_header("release")
 elseif (GIT_FOUND OR Git_FOUND)
   message(STATUS "Found Git: ${GIT_EXECUTABLE}")
-
-  include(GitGetVersionTag)
-  git_get_version_tag(${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} VERSION_TAG_GUI)
-  STRING(REGEX REPLACE "^v([0-9])" "\\1" VERSION_TAG_GUI ${VERSION_TAG_GUI})
-  write_static_version_header(${VERSION_TAG_GUI})
+  get_version_tag_from_git("${GIT_EXECUTABLE}")
+  write_static_version_header(${VERSIONTAG})
 else()
   message(STATUS "WARNING: Git was not found!")
   write_static_version_header("unknown")

cmake/test-protobuf.proto

@@ -1,7 +0,0 @@
-syntax = "proto2";
-
-import "google/protobuf/descriptor.proto";
-
-message Success {
-    optional string message = 1;
-}

components/AdvancedOptionsItem.qml

@@ -1,19 +1,17 @@
 import QtQuick 2.9
 import QtQuick.Layouts 1.1
-import FontAwesome 1.0
 
 import "../components" as MoneroComponents
 
 RowLayout {
     id: advancedOptionsItem
-    
+
     property alias title: title.text
+    property alias tooltip: title.tooltip
     property alias button1: button1
     property alias button2: button2
     property alias button3: button3
-    property alias helpTextLarge: helpTextLarge
-    property alias helpTextSmall: helpTextSmall
-      
+
     RowLayout {
         id: titlecolumn
         Layout.alignment: Qt.AlignTop | Qt.AlignLeft
@@ -24,24 +22,9 @@ RowLayout {
         MoneroComponents.Label {
             id: title
             fontSize: 14
+            tooltipIconVisible: true
         }
 
-        MoneroComponents.Label {
-            id: iconLabel
-            fontSize: 12
-            text: FontAwesome.questionCircle
-            fontFamily: FontAwesome.fontFamily
-            opacity: 0.3
-            MouseArea {
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onClicked: helpText.visible = !helpText.visible
-                onEntered: parent.opacity = 0.4
-                onExited: parent.opacity = 0.3
-            }  
-        }
-        
         Rectangle {
             id: separator
             Layout.fillWidth: true
@@ -54,53 +37,32 @@ RowLayout {
         Layout.fillWidth: false
         Layout.alignment: Qt.AlignTop | Qt.AlignLeft
         spacing: 4
-                
+
         RowLayout {
             Layout.fillWidth: false
             spacing: 12
             Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-            
+
             StandardButton {
                 id: button1
                 small: true
+                primary: false
                 visible: button1.text
             }
-    
+
             StandardButton {
                 id: button2
                 small: true
+                primary: false
                 visible: button2.text
             }
-            
+
             StandardButton {
                 id: button3
                 small: true
+                primary: false
                 visible: button3.text
             }
         }
-        
-        ColumnLayout {
-            id: helpText
-            visible: false     
-            Layout.alignment: Qt.AlignTop | Qt.AlignLeft
-            
-            MoneroComponents.TextPlain {
-                id: helpTextLarge
-                visible: helpTextLarge.text
-                font.family: MoneroComponents.Style.fontRegular.name
-                font.pixelSize: 13
-                color: MoneroComponents.Style.defaultFontColor
-            }
-            
-            MoneroComponents.TextPlain {
-                id: helpTextSmall
-                visible: helpTextSmall.text
-                Layout.leftMargin: 5
-                textFormat: Text.RichText
-                font.family: MoneroComponents.Style.fontRegular.name
-                font.pixelSize: 12
-                color: MoneroComponents.Style.defaultFontColor
-            }
-        }
     }
 }

components/CheckBox.qml

@@ -48,9 +48,17 @@ Item {
     property int fontSize: 14
     property alias fontColor: label.color
     property bool iconOnTheLeft: true
+    property alias tooltipIconVisible: label.tooltipIconVisible
+    property alias tooltip: label.tooltip
     signal clicked()
+
     height: 25
     width: checkBoxLayout.width
+    opacity: enabled ? 1 : 0.7
+
+    Keys.onEnterPressed: toggle()
+    Keys.onReturnPressed: Keys.onEnterPressed(event)
+    Keys.onSpacePressed: Keys.onEnterPressed(event)
 
     function toggle(){
         if (checkBox.toggleOnClick) {
@@ -76,7 +84,7 @@ Item {
                 radius: 3
                 color: checkBox.enabled ? "transparent" : MoneroComponents.Style.inputBoxBackgroundDisabled
                 border.color:
-                    if(checkBox.checked){
+                    if (checkBox.activeFocus) {
                         return MoneroComponents.Style.inputBorderColorActive;
                     } else {
                         return MoneroComponents.Style.inputBorderColorInActive;
@@ -115,7 +123,10 @@ Item {
 
     MouseArea {
         anchors.fill: parent
+        hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
+        onEntered: !label.tooltipIconVisible && label.tooltip ? label.tooltipPopup.open() : ""
+        onExited:  !label.tooltipIconVisible && label.tooltip ? label.tooltipPopup.close() : ""
         onClicked: {
             toggle()
         }

components/ContextMenu.qml

@@ -5,14 +5,21 @@ import FontAwesome 1.0
 import "../components" as MoneroComponents
 
 MouseArea {
+    signal cut()
+    signal copy()
     signal paste()
+    signal remove()
+    signal selectAll()
 
     id: root
     acceptedButtons: Qt.RightButton
     anchors.fill: parent
     onClicked: {
-        if (mouse.button === Qt.RightButton)
+        if (mouse.button === Qt.RightButton) {
+            root.parent.persistentSelection = true;
             contextMenu.open()
+            root.parent.cursorVisible = true;
+        }
     }
 
     Menu {
@@ -22,19 +29,50 @@ MouseArea {
             border.color: MoneroComponents.Style.buttonBackgroundColorDisabledHover
             border.width: 1
             radius: 2
-            color: MoneroComponents.Style.buttonBackgroundColorDisabled
+            color: MoneroComponents.Style.blackTheme ? MoneroComponents.Style.buttonBackgroundColorDisabled : "#E5E5E5"
         }
 
         padding: 1
-        width: 100
+        width: 110
         x: root.mouseX
         y: root.mouseY
 
+        onClosed: {
+            if (!root.parent.activeFocus) {
+                root.parent.cursorVisible = false;
+            }
+            root.parent.persistentSelection = false;
+            root.parent.forceActiveFocus()
+        }
+
+        MoneroComponents.ContextMenuItem {
+            enabled: root.parent.selectedText != "" && !root.parent.readOnly
+            onTriggered: root.cut()
+            text: qsTr("Cut") + translationManager.emptyString
+        }
+
+        MoneroComponents.ContextMenuItem {
+            enabled: root.parent.selectedText != ""
+            onTriggered: root.copy()
+            text: qsTr("Copy") + translationManager.emptyString
+        }
+
         MoneroComponents.ContextMenuItem {
             enabled: root.parent.canPaste === true
-            glyphIcon: FontAwesome.paste
             onTriggered: root.paste()
             text: qsTr("Paste") + translationManager.emptyString
         }
+
+        MoneroComponents.ContextMenuItem {
+            enabled: root.parent.selectedText != "" && !root.parent.readOnly
+            onTriggered: root.remove()
+            text: qsTr("Delete") + translationManager.emptyString
+        }
+
+        MoneroComponents.ContextMenuItem {
+            enabled: root.parent.text != ""
+            onTriggered: root.selectAll()
+            text: qsTr("Select All") + translationManager.emptyString
+        }
     }
 }

components/ContextMenuItem.qml

@@ -13,21 +13,31 @@ MenuItem {
 
     background: Rectangle {
         color: MoneroComponents.Style.buttonBackgroundColorDisabledHover
-        opacity: mouse.containsMouse ? 1 : 0
+        opacity: 0
 
         MouseArea {
             id: mouse
 
             anchors.fill: parent
             hoverEnabled: true
-            onClicked: menuItem.triggered()
-            visible: menuItem.enabled
+            onEntered: {
+                parent.opacity = 1;
+            }
+            onExited: {
+                parent.opacity = 0;
+            }
+            onClicked: {
+                if (menuItem.enabled) {
+                    menuItem.triggered();
+                    parent.opacity = 0;
+                }
+            }
         }
     }
 
     contentItem: RowLayout {
         anchors.fill: parent
-        anchors.leftMargin: 10
+        anchors.leftMargin: 20
         anchors.rightMargin: 10
         opacity: menuItem.enabled ? 1 : 0.4
         spacing: 8
@@ -42,7 +52,7 @@ MenuItem {
         }
 
         Text {
-            color: MoneroComponents.Style.buttonTextColor
+            color: MoneroComponents.Style.blackTheme ? MoneroComponents.Style.buttonTextColor : MoneroComponents.Style.defaultFontColor
             font.family: MoneroComponents.Style.fontRegular.name
             font.pixelSize: 14
             Layout.fillWidth: true

components/DaemonManagerDialog.qml

@@ -32,6 +32,7 @@ import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Window 2.0
+import moneroComponents.Wallet 1.0
 
 import "../components" as MoneroComponents
 
@@ -52,6 +53,7 @@ Window {
     // TODO: implement without hardcoding sizes
     width: 480
     height: 200
+    color: MoneroComponents.Style.middlePanelBackgroundColor
 
     // Make window draggable
     MouseArea {
@@ -78,6 +80,10 @@ Window {
                 running: false;
                 repeat: true
                 onTriggered: {
+                    if (currentWallet.connected() == Wallet.ConnectionStatus_Connected) {
+                        running = false;
+                        root.close();
+                    }
                     countDown--;
                     if(countDown < 0){
                         running = false;
@@ -96,7 +102,7 @@ Window {
                 Layout.fillWidth: true
                 horizontalAlignment: Text.AlignHCenter
                 themeTransition: false
-                color: "black"
+                color: MoneroComponents.Style.defaultFontColor
             }
 
         }

components/DatePicker.qml

@@ -32,6 +32,7 @@ import QtQuick.Controls 2.2 as QtQuickControls2
 import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtQuick.Controls.Styles 1.2
+import FontAwesome 1.0
 
 import "." as MoneroComponents
 import "effects/" as MoneroEffects
@@ -91,8 +92,8 @@ Item {
             anchors.left: parent.left
             anchors.right: parent.right
             height: parent.height - 1
-            anchors.leftMargin: datePicker.expanded ? 1 : 0
-            anchors.rightMargin: datePicker.expanded ? 1 : 0
+            anchors.leftMargin: 0
+            anchors.rightMargin: 0
             radius: 4
             y: 1
             color: datePicker.backgroundColor
@@ -221,21 +222,18 @@ Item {
                 Layout.fillWidth: true
                 color: "transparent"
 
-                Image {
+                MoneroEffects.ImageMask {
                     id: button
                     anchors.right: parent.right
                     anchors.rightMargin: 10
                     anchors.verticalCenter: parent.verticalCenter
-                    source: "qrc:///images/whiteDropIndicator.png"
-                    visible: false
-                }
-
-                ColorOverlay {
-                    source: button
-                    anchors.fill: button
+                    image: "qrc:///images/whiteDropIndicator.png"
+                    height: 8
+                    width: 12
+                    fontAwesomeFallbackIcon: FontAwesome.arrowDown
+                    fontAwesomeFallbackSize: 14
                     color: MoneroComponents.Style.defaultFontColor
                     rotation: datePicker.expanded ? 180 : 0
-                    opacity: 1
                 }
 
                 MouseArea {
@@ -252,12 +250,16 @@ Item {
         id: popup
         padding: 0
         closePolicy: QtQuickControls2.Popup.CloseOnEscape | QtQuickControls2.Popup.CloseOnPressOutsideParent
+        onOpened: {
+            calendar.visibleMonth = currentDate.getMonth();
+            calendar.visibleYear = currentDate.getFullYear();
+        }
 
         Rectangle {
             id: calendarRect
             width: head.width
             x: head.x
-            y: head.y + head.height + 10
+            y: head.y + head.height - 2
 
             color: MoneroComponents.Style.middlePanelBackgroundColor
             border.width: 1
@@ -266,11 +268,16 @@ Item {
             clip: true
 
             Behavior on height {
-                NumberAnimation { duration: 100; easing.type: Easing.InQuad }
+                NumberAnimation { duration: 150; easing.type: Easing.InQuad }
             }
 
             MouseArea {
                 anchors.fill: parent
+                scrollGestureEnabled: false
+                onWheel: {
+                    if (wheel.angleDelta.y > 0) return calendar.showPreviousMonth();
+                    if (wheel.angleDelta.y < 0) return calendar.showNextMonth();
+                }
             }
 
             Rectangle {
@@ -305,11 +312,6 @@ Item {
                             id: dayRect
                             anchors.fill: parent
                             radius: parent.implicitHeight / 2
-                            color: {
-                                if(dayArea.pressed && styleData.visibleMonth)
-                                    return MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000"
-                                return "transparent";
-                            }
                         }
 
                         MoneroComponents.TextPlain {
@@ -327,19 +329,32 @@ Item {
                             text: styleData.date.getDate()
                             themeTransition: false
                             color: {
-                                if(!styleData.visibleMonth) return MoneroComponents.Style.lightGreyFontColor
-                                if(dayArea.pressed) return MoneroComponents.Style.defaultFontColor
-                                if(styleData.today) return MoneroComponents.Style.orange
-                                return MoneroComponents.Style.defaultFontColor
+                              if (currentDate.toDateString() === styleData.date.toDateString()) {
+                                  if (dayArea.containsMouse) {
+                                      dayRect.color = MoneroComponents.Style.buttonBackgroundColorHover;
+                                  } else {
+                                      dayRect.color = MoneroComponents.Style.buttonBackgroundColor;
+                                  }
+                              } else {
+                                  if (dayArea.containsMouse) {
+                                      dayRect.color = MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000"
+                                  } else {
+                                      dayRect.color = "transparent";
+                                  }
+                              }
+                              if(!styleData.valid) return "transparent"
+                              if(styleData.date.toDateString() === (new Date()).toDateString()) return "#FFFF00"
+                              if(!styleData.visibleMonth) return MoneroComponents.Style.lightGreyFontColor
+                              if(dayArea.pressed) return MoneroComponents.Style.defaultFontColor
+                              return MoneroComponents.Style.defaultFontColor
                             }
                         }
 
                         MouseArea {
                             id: dayArea
                             anchors.fill: parent
+                            visible: styleData.valid
                             hoverEnabled: true
-                            onEntered: dayRect.color = MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000"
-                            onExited: dayRect.color = "transparent"
                             cursorShape: Qt.PointingHandCursor
                             onClicked: {
                                 if(styleData.visibleMonth) {
@@ -397,18 +412,15 @@ Item {
                             anchors.bottom: parent.bottom
                             width: height
 
-                            Image {
+                            MoneroEffects.ImageMask {
                                 id: prevMonthIcon
                                 anchors.centerIn: parent
-                                source: "qrc:///images/prevMonth.png"
-                                visible: false
-                            }
-
-                            ColorOverlay {
-                                source: prevMonthIcon
-                                anchors.fill: prevMonthIcon
+                                image: "qrc:///images/prevMonth.png"
+                                height: 8
+                                width: 12
+                                fontAwesomeFallbackIcon: FontAwesome.arrowLeft
+                                fontAwesomeFallbackSize: 14
                                 color: MoneroComponents.Style.defaultFontColor
-                                opacity: 0.5
                             }
 
                             MouseArea {
@@ -426,19 +438,16 @@ Item {
                             anchors.bottom: parent.bottom
                             width: height
 
-                            Image {
+                            MoneroEffects.ImageMask {
                                 id: nextMonthIcon
                                 anchors.centerIn: parent
-                                source: "qrc:///images/prevMonth.png"
-                                visible: false
-                            }
-
-                            ColorOverlay {
-                                source: nextMonthIcon
-                                anchors.fill: nextMonthIcon
-                                color: MoneroComponents.Style.defaultFontColor
-                                opacity: 0.5
+                                image: "qrc:///images/prevMonth.png"
+                                height: 8
+                                width: 12
                                 rotation: 180
+                                fontAwesomeFallbackIcon: FontAwesome.arrowLeft
+                                fontAwesomeFallbackSize: 14
+                                color: MoneroComponents.Style.defaultFontColor
                             }
 
                             MouseArea {

components/Dialog.qml

@@ -0,0 +1,66 @@
+// Copyright (c) 2021, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.1
+
+import "." as MoneroComponents
+
+Popup {
+    id: dialog
+
+    default property alias content: mainLayout.children
+    property alias title: header.text
+
+    background: Rectangle {
+        border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25)
+        border.width: 1
+        color: MoneroComponents.Style.blackTheme ? "black" : "white"
+        radius: 10
+    }
+    closePolicy: Popup.CloseOnEscape
+    focus: true
+    padding: 20
+    x: (appWindow.width - width) / 2
+    y: (appWindow.height - height) / 2
+
+    ColumnLayout {
+        id: mainLayout
+        spacing: dialog.padding
+
+        Text {
+            id: header
+            color: MoneroComponents.Style.defaultFontColor
+            font.bold: true
+            font.family: MoneroComponents.Style.fontRegular.name
+            font.pixelSize: 18
+            visible: text != ""
+        }
+    }
+}

components/IconButton.qml

@@ -36,19 +36,28 @@ MoneroEffects.ImageMask {
     color: MoneroComponents.Style.defaultFontColor
     image: ""
 
+    property alias tooltip: tooltip.text
     signal clicked(var mouse)
 
+    MoneroComponents.Tooltip {
+        id: tooltip
+        anchors.fill: parent
+        tooltipLeft: true
+    }
+
     MouseArea {
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
 
         onEntered: {
+            tooltip.text ? tooltip.tooltipPopup.open() : ""
             button.width = button.width + 2
             button.height = button.height + 2
         }
 
         onExited: {
+            tooltip.text ? tooltip.tooltipPopup.close() : ""
             button.width = button.width - 2
             button.height = button.height - 2
         }

components/InlineButton.qml

@@ -30,30 +30,29 @@ import QtQuick 2.9
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 
+import FontAwesome 1.0
+
 import "." as MoneroComponents
 import "./effects/" as MoneroEffects
 
 Item {
     id: inlineButton
-    height: parent.height
-    anchors.top: parent.top
-    anchors.bottom: parent.bottom
 
     property bool small: false
-    property string shadowPressedColor: "#B32D00"
-    property string shadowReleasedColor: "#FF4304"
-    property string pressedColor: "#FF4304"
-    property string releasedColor: "#FF6C3C"
-    property string icon: ""
     property string textColor: MoneroComponents.Style.inlineButtonTextColor
-    property int fontSize: small ? 14 : 16
-    property int rectHeight: small ? 24 : 24
-    property int rectHMargin: small ? 16 : 22
     property alias text: inlineText.text
     property alias fontPixelSize: inlineText.font.pixelSize
     property alias fontFamily: inlineText.font.family
+    property alias fontStyleName: inlineText.font.styleName
+    property bool isFontAwesomeIcon: fontFamily == FontAwesome.fontFamily || fontFamily == FontAwesome.fontFamilySolid
     property alias buttonColor: rect.color
-    property alias buttonHeight: rect.height
+    property alias tooltip: tooltip.text
+    property alias tooltipLeft: tooltip.tooltipLeft
+    property alias tooltipBottom: tooltip.tooltipBottom
+
+    height: isFontAwesomeIcon ? 30 : 24
+    width: isFontAwesomeIcon ? height : inlineText.width + 16
+
     signal clicked()
 
     function doClick() {
@@ -64,20 +63,16 @@ Item {
 
     Rectangle{
         id: rect
-        color: MoneroComponents.Style.buttonInlineBackgroundColor
-        height: 24
-        width: inlineText.text ? (inlineText.width + 16) : inlineButton.icon ? (inlineImage.width + 16) : rect.height
+        anchors.fill: parent
+        color: buttonArea.containsMouse ? MoneroComponents.Style.buttonInlineBackgroundColorHover : MoneroComponents.Style.buttonInlineBackgroundColor
         radius: 4
 
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.right: parent.right
-        anchors.rightMargin: 4
 
         MoneroComponents.TextPlain {
             id: inlineText
             font.family: MoneroComponents.Style.fontBold.name
             font.bold: true
-            font.pixelSize: inlineButton.fontSize
+            font.pixelSize: inlineButton.isFontAwesomeIcon ? 22 : inlineButton.small ? 14 : 16
             color: inlineButton.textColor
             anchors.verticalCenter: parent.verticalCenter
             anchors.horizontalCenter: parent.horizontalCenter
@@ -90,11 +85,9 @@ Item {
             }
         }
 
-        Image {
-            id: inlineImage
-            visible: inlineButton.icon !== ""
-            anchors.centerIn: parent
-            source: inlineButton.icon
+        MoneroComponents.Tooltip {
+            id: tooltip
+            anchors.fill: parent
         }
 
         MouseArea {
@@ -102,14 +95,15 @@ Item {
             cursorShape: rect.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
             hoverEnabled: true
             anchors.fill: parent
-            onClicked: doClick()
+            onClicked: {
+                tooltip.text ? tooltip.tooltipPopup.close() : ""
+                doClick()
+            }
             onEntered: {
-                rect.color = buttonColor ? buttonColor : "#707070";
-                rect.opacity = 0.8;
+                tooltip.text ? tooltip.tooltipPopup.open() : ""
             }
             onExited: {
-                rect.opacity = 1.0;
-                rect.color = buttonColor ? buttonColor : "#808080";
+                tooltip.text ? tooltip.tooltipPopup.close() : ""
             }
         }
     }

components/Input.qml

@@ -48,9 +48,16 @@ TextField {
 
     MoneroComponents.ContextMenu {
         cursorShape: Qt.IBeamCursor
+        onCut: textField.cut();
+        onCopy: textField.copy();
         onPaste: {
-            textField.clear();
+            var previoustextFieldLength = textField.length
+            var previousCursorPosition = textField.cursorPosition;
             textField.paste();
+            textField.forceActiveFocus()
+            textField.cursorPosition = previousCursorPosition + (textField.length - previoustextFieldLength);
         }
+        onRemove: textField.remove(selectionStart, selectionEnd);
+        onSelectAll: textField.selectAll();
     }
 }

components/InputDialog.qml

@@ -129,6 +129,7 @@ Item {
 
                 MoneroComponents.StandardButton {
                     id: cancelButton
+                    primary: false
                     small: true
                     width: 120
                     fontSize: 14

components/InputMulti.qml

@@ -71,9 +71,16 @@ TextArea {
 
     MoneroComponents.ContextMenu {
         cursorShape: Qt.IBeamCursor
+        onCut: textArea.cut();
+        onCopy: textArea.copy();
         onPaste: {
-            textArea.clear();
+            var previoustextFieldLength = textArea.length
+            var previousCursorPosition = textArea.cursorPosition;
             textArea.paste();
+            textArea.forceActiveFocus()
+            textArea.cursorPosition = previousCursorPosition + (textArea.length - previoustextFieldLength);
         }
+        onRemove: textArea.remove(selectionStart, selectionEnd);
+        onSelectAll: textArea.selectAll();
     }
 }

components/Label.qml

@@ -34,7 +34,10 @@ import "../components" as MoneroComponents
 Item {
     id: item
     property alias text: label.text
+    property alias tooltip: label.tooltip
+    property alias tooltipIconVisible: label.tooltipIconVisible
     property alias color: label.color
+    property alias labelMouseArea: labelMouseArea
     property int textFormat: Text.PlainText
     property string tipText: ""
     property int fontSize: 16
@@ -70,9 +73,13 @@ Item {
         onLinkActivated: item.linkActivated()
         textFormat: parent.textFormat
         MouseArea {
+            id: labelMouseArea
             anchors.fill: parent
+            hoverEnabled: true
             acceptedButtons: Qt.NoButton
-            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+            cursorShape: parent.hoveredLink || (tooltip && !tooltipIconVisible) ? Qt.PointingHandCursor : Qt.ArrowCursor
+            onEntered: tooltip && !tooltipIconVisible ? parent.tooltipPopup.open() : undefined
+            onExited: tooltip && !tooltipIconVisible ? parent.tooltipPopup.close() : undefined
         }
     }
 }

components/LabelSubheader.qml

@@ -34,6 +34,7 @@ import "../components/effects/" as MoneroEffects
 Label {
     id: item
     fontSize: 18
+    tooltipIconVisible: true
 
     Rectangle {
         anchors.top: item.bottom

components/LanguageButton.qml

@@ -1,21 +1,21 @@
-// Copyright (c) 2014-2019, The Monero Project
-// 
+// Copyright (c) 2020, The Monero Project
+//
 // All rights reserved.
-// 
+//
 // Redistribution and use in source and binary forms, with or without modification, are
 // permitted provided that the following conditions are met:
-// 
+//
 // 1. Redistributions of source code must retain the above copyright notice, this list of
 //    conditions and the following disclaimer.
-// 
+//
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list
 //    of conditions and the following disclaimer in the documentation and/or other
 //    materials provided with the distribution.
-// 
+//
 // 3. Neither the name of the copyright holder nor the names of its contributors may be
 //    used to endorse or promote products derived from this software without specific
 //    prior written permission.
-// 
+//
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
@@ -26,9 +26,42 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <assert.h>
+import QtQuick 2.9
+import QtQuick.Layouts 1.3
 
-static_assert(1, "FAIL");
-int main(int argc, char *argv[]) {
-	return 0;
+import FontAwesome 1.0
+
+import "../components" as MoneroComponents
+
+Item {
+    implicitHeight: layout.height
+    implicitWidth: layout.width
+
+    RowLayout {
+        id: layout
+        opacity: mouseArea.containsMouse ? 1 : 0.85
+        spacing: 10
+
+        MoneroComponents.Label {
+            Layout.bottomMargin: 5
+            fontColor: MoneroComponents.Style.defaultFontColor
+            fontFamily: FontAwesome.fontFamilySolid
+            fontSize: 26
+            styleName: "Solid"
+            text: FontAwesome.language
+        }
+
+        MoneroComponents.TextPlain {
+            font.pixelSize: 14
+            text: persistentSettings.language
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+        onClicked: appWindow.toggleLanguageView()
+    }
 }

components/LanguageSidebar.qml

@@ -37,17 +37,6 @@ import QtQuick.Controls 2.0
 Drawer {
     id: sideBar
 
-    // @TODO: Qt 5.10 introduces `opened` built-in for Drawer
-    property bool isOpened: false
-
-    onClosed: {
-        isOpened = false;
-    }
-
-    onOpened: {
-        isOpened = true;
-    }
-
     width: 240
     height: parent.height - (persistentSettings.customDecorations ? 50 : 0)
     y: titleBar.height
@@ -64,26 +53,64 @@ Drawer {
         color: "red"
 
         ListView {
+            id: languagesListView
             clip: true
             Layout.fillHeight: true
             Layout.fillWidth: true
             boundsBehavior: Flickable.StopAtBounds
             width: sideBar.width
             height: sideBar.height
+            focus: true
 
             model: langModel
 
+            Keys.onUpPressed: currentIndex !== 0 ? currentIndex = currentIndex - 1 : ""
+            Keys.onBacktabPressed: currentIndex !== 0 ? currentIndex = currentIndex - 1 : ""
+            Keys.onDownPressed: currentIndex + 1 !== count ? currentIndex = currentIndex + 1 : ""
+            Keys.onTabPressed: currentIndex + 1 !== count ? currentIndex = currentIndex + 1 : ""
+
             delegate: Rectangle {
                 id: item
-                color: "transparent"
+                color: index == languagesListView.currentIndex ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent"
                 width: sideBar.width
                 height: 32
 
+                Accessible.role: Accessible.ListItem
+                Accessible.name: display_name
+                Keys.onEnterPressed: setSelectedItemAsLanguage();
+                Keys.onReturnPressed: setSelectedItemAsLanguage();
+                Keys.onSpacePressed: setSelectedItemAsLanguage();
+
+                function setSelectedItemAsLanguage() {
+                    var locale_spl = locale.split("_");
+
+                    // reload active translations
+                    console.log(locale_spl[0]);
+                    translationManager.setLanguage(locale_spl[0]);
+
+                    // set wizard language settings
+                    persistentSettings.locale = locale;
+                    persistentSettings.language = display_name;
+                    persistentSettings.language_wallet = wallet_language;
+
+                    appWindow.showStatusMessage(qsTr("Language changed."), 3);
+                    appWindow.toggleLanguageView();
+                }
+
+                Rectangle {
+                    id: selectedIndicator
+                    anchors.left: parent.left
+                    anchors.leftMargin: 0
+                    height: parent.height
+                    width: 2
+                    color: index == languagesListView.currentIndex ? MoneroComponents.Style.buttonBackgroundColor : "transparent"
+                }
+
                 Rectangle {
                     id: flagRect
                     height: 24
                     width: 24
-                    anchors.left: parent.left
+                    anchors.left: selectedIndicator.right
                     anchors.leftMargin: 4
                     anchors.verticalCenter: parent.verticalCenter
                     color: "transparent"
@@ -96,8 +123,8 @@ Drawer {
 
                 MoneroComponents.TextPlain {
                     anchors.left: parent.left
-                    anchors.leftMargin: 30
-                    font.bold: true
+                    anchors.leftMargin: 32
+                    font.bold: languagesListView.currentIndex == index ? true : false
                     font.pixelSize: 14
                     color: MoneroComponents.Style.defaultFontColor
                     text: display_name
@@ -123,21 +150,7 @@ Drawer {
                     MouseArea {
                         anchors.fill: parent
                         cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            var locale_spl = locale.split("_");
-
-                            // reload active translations
-                            console.log(locale_spl[0]);
-                            translationManager.setLanguage(locale_spl[0]);
-
-                            // set wizard language settings
-                            wizard.language_locale = locale;
-                            wizard.language_wallet = wallet_language;
-                            wizard.language_language = display_name;
-
-                            appWindow.showStatusMessage(qsTr("Language changed."), 3);
-                            appWindow.toggleLanguageView();
-                        }
+                        onClicked: setSelectedItemAsLanguage();
                         hoverEnabled: true
                         onEntered: {
                             // item.color = "#26FFFFFF"
@@ -177,4 +190,12 @@ Drawer {
             }
         }
     }
+
+    function selectCurrentLanguage() {
+        for (var i = 0; i < langModel.count; ++i) {
+            if (langModel.get(i).display_name === persistentSettings.language)  {
+                languagesListView.currentIndex = i;
+            }
+        }
+    }
 }

components/LineEdit.qml

@@ -29,14 +29,25 @@
 import FontAwesome 1.0
 import QtQuick 2.9
 import QtGraphicalEffects 1.0
+import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
 
-Item {
+ColumnLayout {
     id: item
+    Layout.fillWidth: true
+
+    default property alias content: inlineButtons.children
+
     property alias input: input
     property alias text: input.text
 
+    property int inputPaddingLeft: 10
+    property int inputPaddingRight: 10
+    property int inputPaddingTop: 10
+    property int inputPaddingBottom: 10
+    property int inputRadius: 4
+
     property bool password: false
     property bool passwordHidden: true
     property var passwordLinked: null
@@ -48,33 +59,40 @@ Item {
     property int placeholderFontSize: 18
     property string placeholderColor: MoneroComponents.Style.defaultFontColor
     property real placeholderOpacity: 0.35
+    property real placeholderLeftMargin: {
+        if (placeholderCenter) {
+            return undefined;
+        } else {
+            return inputPaddingLeft;
+        }
+    }
 
     property alias acceptableInput: input.acceptableInput
     property alias validator: input.validator
     property alias readOnly : input.readOnly
     property alias cursorPosition: input.cursorPosition
-    property alias inlineButton: inlineButtonId
-    property alias inlineButtonText: inlineButtonId.text
-    property alias inlineIcon: inlineIcon.visible
     property bool copyButton: false
+    property bool pasteButton: false
     property alias copyButtonText: copyButtonId.text
     property alias copyButtonEnabled: copyButtonId.enabled
 
     property bool borderDisabled: false
     property string borderColor: {
-        if(error && input.text !== ""){
+        if ((error && input.text !== "") || (errorWhenEmpty && input.text == "")) {
             return MoneroComponents.Style.inputBorderColorInvalid;
-        } else if(input.activeFocus){
+        } else if (input.activeFocus) {
             return MoneroComponents.Style.inputBorderColorActive;
         } else {
             return MoneroComponents.Style.inputBorderColorInActive;
         }
     }
 
+    property string fontFamily: MoneroComponents.Style.fontRegular.name
     property int fontSize: 18
     property bool fontBold: false
     property alias fontColor: input.color
     property bool error: false
+    property bool errorWhenEmpty: false
     property alias labelText: inputLabel.text
     property alias labelColor: inputLabel.color
     property alias labelTextFormat: inputLabel.textFormat
@@ -85,15 +103,14 @@ Item {
     property alias labelWrapMode: inputLabel.wrapMode
     property alias labelHorizontalAlignment: inputLabel.horizontalAlignment
     property bool showingHeader: inputLabel.text !== "" || copyButton
-    property int inputHeight: 42
+    property int inputHeight: 39
 
     signal labelLinkActivated(); // input label, rich text <a> signal
     signal editingFinished();
     signal accepted();
     signal textUpdated();
 
-    height: showingHeader ? (inputLabel.height + inputItem.height + 2) : 42
-
+    onActiveFocusChanged: activeFocus && input.forceActiveFocus()
     onTextUpdated: {
         // check to remove placeholder text when there is content
         if(item.isEmpty()){
@@ -138,45 +155,100 @@ Item {
         }
     }
 
-    MoneroComponents.TextPlain {
-        id: inputLabel
-        anchors.top: parent.top
-        anchors.left: parent.left
-        font.family: MoneroComponents.Style.fontRegular.name
-        font.pixelSize: labelFontSize
-        font.bold: labelFontBold
-        textFormat: Text.RichText
-        color: MoneroComponents.Style.defaultFontColor
-        onLinkActivated: item.labelLinkActivated()
+    spacing: 0
+    Rectangle {
+        id: inputLabelRect
+        color: "transparent"
+        Layout.fillWidth: true
+        height: (inputLabel.height + 10)
+        visible: showingHeader ? true : false
 
-        MouseArea {
-            anchors.fill: parent
-            acceptedButtons: Qt.NoButton
-            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-        }
-    }
+        MoneroComponents.TextPlain {
+            id: inputLabel
+            anchors.top: parent.top
+            anchors.left: parent.left
+            font.family: MoneroComponents.Style.fontRegular.name
+            font.pixelSize: labelFontSize
+            font.bold: labelFontBold
+            textFormat: Text.RichText
+            color: MoneroComponents.Style.defaultFontColor
+            onLinkActivated: item.labelLinkActivated()
 
-    MoneroComponents.LabelButton {
-        id: copyButtonId
-        text: qsTr("Copy") + translationManager.emptyString
-        anchors.right: parent.right
-        onClicked: {
-            if (input.text.length > 0) {
-                console.log("Copied to clipboard");
-                clipboard.setText(input.text);
-                appWindow.showStatusMessage(qsTr("Copied to clipboard"), 3);
+            MouseArea {
+                anchors.fill: parent
+                acceptedButtons: Qt.NoButton
+                cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+            }
+        }
+
+        RowLayout {
+            anchors.right: parent.right
+            spacing: 16
+
+            MoneroComponents.LabelButton {
+                id: copyButtonId
+                text: qsTr("Copy") + translationManager.emptyString
+                onClicked: {
+                    if (input.text.length > 0) {
+                        console.log("Copied to clipboard");
+                        clipboard.setText(input.text);
+                        appWindow.showStatusMessage(qsTr("Copied to clipboard"), 3);
+                    }
+                }
+                visible: copyButton && input.text !== ""
+            }
+
+            MoneroComponents.LabelButton {
+                id: pasteButtonId
+                onClicked: {
+                    input.clear();
+                    input.paste();
+                }
+                text: qsTr("Paste") + translationManager.emptyString
+                visible: pasteButton
             }
         }
-        visible: copyButton && input.text !== ""
     }
 
-    Item{
-        id: inputItem
-        height: inputHeight
-        anchors.top: showingHeader ? inputLabel.bottom : parent.top
-        anchors.topMargin: showingHeader ? 12 : 2
-        width: parent.width
-        clip: true
+    MoneroComponents.Input {
+        id: input
+        KeyNavigation.backtab: item.KeyNavigation.backtab
+        KeyNavigation.tab: item.KeyNavigation.tab
+        Layout.fillWidth: true
+        Layout.preferredHeight: inputHeight
+
+        leftPadding: item.inputPaddingLeft
+        rightPadding: (inlineButtons.width > 0 ? inlineButtons.width + inlineButtons.spacing : 0) + inputPaddingRight + (password || passwordLinked ? 45 : 0)
+        topPadding: item.inputPaddingTop
+        bottomPadding: item.inputPaddingBottom
+
+        font.family: item.fontFamily
+        font.pixelSize: item.fontSize
+        font.bold: item.fontBold
+        onEditingFinished: item.editingFinished()
+        onAccepted: item.accepted();
+        onTextChanged: item.textUpdated()
+        echoMode: isPasswordHidden() ? TextInput.Password : TextInput.Normal
+
+        MoneroComponents.Label {
+            visible: password || passwordLinked
+            fontSize: 20
+            text: isPasswordHidden() ? FontAwesome.eye : FontAwesome.eyeSlash
+            opacity: eyeMouseArea.containsMouse ? 0.9 : 0.7
+            fontFamily: FontAwesome.fontFamily
+            anchors.right: parent.right
+            anchors.rightMargin: 15
+            anchors.verticalCenter: parent.verticalCenter
+            anchors.verticalCenterOffset: 1
+
+            MouseArea {
+                id: eyeMouseArea
+                anchors.fill: parent
+                cursorShape: Qt.PointingHandCursor
+                hoverEnabled: true
+                onClicked: passwordToggle()
+            }
+        }
 
         MoneroComponents.TextPlain {
             id: placeholderLabel
@@ -184,13 +256,7 @@ Item {
             anchors.verticalCenter: parent.verticalCenter
             anchors.horizontalCenter: placeholderCenter ? parent.horizontalCenter : undefined
             anchors.left: placeholderCenter ? undefined : parent.left
-            anchors.leftMargin: {
-                if(placeholderCenter){
-                    return undefined;
-                }
-                else if(inlineIcon.visible){ return 50; }
-                else { return 10; }
-            }
+            anchors.leftMargin: placeholderLeftMargin
 
             opacity: item.placeholderOpacity
             color: item.placeholderColor
@@ -213,60 +279,15 @@ Item {
             anchors.fill: parent
             border.width: borderDisabled ? 0 : 1
             border.color: borderColor
-            radius: 4
+            radius: item.inputRadius
         }
 
-        Image {
-            id: inlineIcon
-            width: 26
-            height: 26
-            anchors.top: parent.top
-            anchors.topMargin: 8
-            anchors.left: parent.left
-            anchors.leftMargin: 12
-            source: "qrc:///images/moneroIcon-28x28.png"
-            visible: false
-        }
-
-        MoneroComponents.Input {
-            id: input
-            anchors.fill: parent
-            anchors.leftMargin: inlineIcon.visible ? 44 : 0
-            font.pixelSize: item.fontSize
-            font.bold: item.fontBold
-            onEditingFinished: item.editingFinished()
-            onAccepted: item.accepted();
-            onTextChanged: item.textUpdated()
-            topPadding: 10
-            bottomPadding: 10
-            echoMode: isPasswordHidden() ? TextInput.Password : TextInput.Normal
-
-            MoneroComponents.Label {
-                visible: password || passwordLinked
-                fontSize: 20
-                text: isPasswordHidden() ? FontAwesome.eye : FontAwesome.eyeSlash
-                opacity: eyeMouseArea.containsMouse ? 0.9 : 0.7
-                fontFamily: FontAwesome.fontFamily
-                anchors.right: parent.right
-                anchors.rightMargin: 15
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.verticalCenterOffset: 1
-
-                MouseArea {
-                    id: eyeMouseArea
-                    anchors.fill: parent
-                    cursorShape: Qt.PointingHandCursor
-                    hoverEnabled: true
-                    onClicked: passwordToggle()
-                }
-            }
-        }
-
-        MoneroComponents.InlineButton {
-            id: inlineButtonId
-            visible: item.inlineButtonText ? true : false
+        RowLayout {
+            id: inlineButtons
+            anchors.verticalCenter: parent.verticalCenter
             anchors.right: parent.right
-            anchors.rightMargin: 8
+            anchors.rightMargin: inputPaddingRight
+            spacing: 4
         }
     }
 }

components/LineEditMulti.qml

@@ -36,6 +36,8 @@ ColumnLayout {
 
     Layout.fillWidth: true
 
+    default property alias content: inlineButtons.children
+
     property alias text: input.text
     property alias labelText: inputLabel.text
     property alias labelButtonText: labelButton.text
@@ -65,7 +67,8 @@ ColumnLayout {
         }
     }
 
-    property bool error: false
+    property alias error: input.error
+    property alias cursorPosition: input.cursorPosition
 
     property string labelFontColor: MoneroComponents.Style.defaultFontColor
     property bool labelFontBold: false
@@ -73,6 +76,7 @@ ColumnLayout {
     property bool labelButtonVisible: false
 
     property string fontColor: MoneroComponents.Style.defaultFontColor
+    property string fontFamily: MoneroComponents.Style.fontRegular.name
     property bool fontBold: false
     property int fontSize: 16
 
@@ -85,14 +89,13 @@ ColumnLayout {
     property alias addressValidation: input.addressValidation
     property string backgroundColor: "" // mock
 
-    property alias inlineButton: inlineButtonId
-    property bool inlineButtonVisible: false
-    property alias inlineButton2: inlineButton2Id
-    property bool inlineButton2Visible: false
-
     signal labelButtonClicked();
     signal inputLabelLinkActivated();
     signal editingFinished();
+    signal returnPressed();
+    signal enterPressed();
+
+    onActiveFocusChanged: activeFocus && input.forceActiveFocus()
 
     spacing: 0
     Rectangle {
@@ -159,20 +162,25 @@ ColumnLayout {
         id: input
         readOnly: false
         addressValidation: false
+        KeyNavigation.backtab: item.KeyNavigation.backtab
+        KeyNavigation.priority: KeyNavigation.BeforeItem
+        KeyNavigation.tab: item.KeyNavigation.tab
         Layout.fillWidth: true
-        
+
         leftPadding: item.inputPaddingLeft
-        rightPadding: item.inputPaddingRight
+        rightPadding: (inlineButtons.width > 0 ? inlineButtons.width + inlineButtons.spacing : 0) + inputPaddingRight
         topPadding: item.inputPaddingTop
         bottomPadding: item.inputPaddingBottom
 
         wrapMode: item.wrapMode
+        font.family: item.fontFamily
         fontSize: item.fontSize
         fontBold: item.fontBold
         fontColor: item.fontColor
         mouseSelection: item.mouseSelection
         onEditingFinished: item.editingFinished()
-        error: item.error
+        Keys.onReturnPressed: item.returnPressed()
+        Keys.onEnterPressed: item.enterPressed()
 
         MoneroComponents.TextPlain {
             id: placeholderLabel
@@ -198,18 +206,12 @@ ColumnLayout {
             visible: !item.borderDisabled
         }
 
-        MoneroComponents.InlineButton {
-            id: inlineButtonId
-            visible: (inlineButtonId.text || inlineButtonId.icon) && inlineButtonVisible ? true : false
+        RowLayout {
+            id: inlineButtons
+            anchors.verticalCenter: parent.verticalCenter
             anchors.right: parent.right
-            anchors.rightMargin: 8
-        }
-        
-        MoneroComponents.InlineButton {
-            id: inlineButton2Id
-            visible: (inlineButton2Id.text || inlineButton2Id.icon) && inlineButton2Visible ? true : false
-            anchors.right: parent.right
-            anchors.rightMargin: inlineButtonVisible ? 48 : 8
+            anchors.rightMargin: inputPaddingRight
+            spacing: 4
         }
     }
 }

components/MenuBar.qml

@@ -1,21 +1,21 @@
 // Copyright (c) 2014-2019, The Monero Project
-// 
+//
 // All rights reserved.
-// 
+//
 // Redistribution and use in source and binary forms, with or without modification, are
 // permitted provided that the following conditions are met:
-// 
+//
 // 1. Redistributions of source code must retain the above copyright notice, this list of
 //    conditions and the following disclaimer.
-// 
+//
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list
 //    of conditions and the following disclaimer in the documentation and/or other
 //    materials provided with the distribution.
-// 
+//
 // 3. Neither the name of the copyright holder nor the names of its contributors may be
 //    used to endorse or promote products derived from this software without specific
 //    prior written permission.
-// 
+//
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
@@ -26,27 +26,30 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <libusb.h>
+import Qt.labs.platform 1.0 as PlatformLabs
+import "." as MoneroComponents
 
-#define UNUSED(expr) (void)(expr)
-
-int main(int argc, char *argv[]) {
-  libusb_device **devs;
-  libusb_context *ctx = NULL;
-
-  int r = libusb_init(&ctx); UNUSED(r);
-  ssize_t cnt = libusb_get_device_list(ctx, &devs); UNUSED(cnt);
-
-  struct libusb_device_descriptor desc;
-  r = libusb_get_device_descriptor(devs[0], &desc); UNUSED(r);
-  uint8_t bus_id = libusb_get_bus_number(devs[0]); UNUSED(bus_id);
-  uint8_t addr = libusb_get_device_address(devs[0]); UNUSED(addr);
-
-  uint8_t tmp_path[16];
-  r = libusb_get_port_numbers(devs[0], tmp_path, sizeof(tmp_path));
-  UNUSED(r);
-  UNUSED(tmp_path);
-
-  libusb_free_device_list(devs, 1);
-  libusb_exit(ctx);
+PlatformLabs.MenuBar {
+    PlatformLabs.Menu {
+        title: qsTr("File")
+        PlatformLabs.MenuItem {
+            enabled: appWindow.viewState === "normal"
+            text: qsTr("Close Wallet")
+            onTriggered: appWindow.showWizard()
+        }
+    }
+    PlatformLabs.Menu {
+        title: qsTr("View")
+        PlatformLabs.MenuItem {
+            text: MoneroComponents.Style.blackTheme ? qsTr("Light Theme") : qsTr("Dark Theme")
+            onTriggered: {
+                MoneroComponents.Style.blackTheme = !MoneroComponents.Style.blackTheme;
+            }
+        }
+        PlatformLabs.MenuItem {
+            text: qsTr("Change Language")
+            onTriggered: appWindow.toggleLanguageView();
+        }
+    }
 }
+

components/MenuButton.qml

@@ -92,7 +92,7 @@ Rectangle {
         anchors.leftMargin: 20
         height: parent.height
         width: 2
-        color: button.checked ? MoneroComponents.Style.buttonBackgroundColor : "transparent"
+        color: button.checked ? MoneroComponents.Style.accountColors[currentAccountIndex % MoneroComponents.Style.accountColors.length] : "transparent"
 
         // button text
         MoneroComponents.TextPlain {

components/Navbar.qml

@@ -0,0 +1,217 @@
+// Copyright (c) 2014-2021, The Monero Project
+// 
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+// 
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+// 
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+// 
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.9
+import QtQuick.Layouts 1.1
+import "." as MoneroComponents
+
+Rectangle {
+    default property list<MoneroComponents.NavbarItem> items
+    property alias currentIndex: repeater.currentIndex
+    property alias previousIndex: repeater.previousIndex
+
+    color: "transparent"
+    height: grid.height
+    width: grid.width
+
+    GridLayout {
+        id: grid
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.horizontalCenter: parent.horizontalCenter
+        columnSpacing: 0
+        property string fontColorActive: MoneroComponents.Style.blackTheme ? "white" : "white"
+        property string fontColorInActive: MoneroComponents.Style.blackTheme ? "white" : MoneroComponents.Style.dimmedFontColor
+        property int fontSize: 15
+        property bool fontBold: true
+        property var fontFamily: MoneroComponents.Style.fontRegular.name
+        property string borderColor: MoneroComponents.Style.blackTheme ? "#808080" : "#B9B9B9"
+        property int textMargin: {
+            // left-right margins for a given cell
+            if(appWindow.width < 890){
+                return 32;
+            } else {
+                return 64;
+            }
+        }
+
+        Rectangle {
+            // navbar left side border
+            id: navBarLeft
+            Layout.preferredWidth: 2
+            Layout.preferredHeight: 32
+            color: "transparent"
+
+            Rectangle {
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                width: 1
+                height: parent.height - 2
+                color: grid.borderColor
+            }
+
+            ColumnLayout {
+                anchors.top: parent.top
+                anchors.bottom: parent.bottom
+                anchors.right: parent.right
+                width: 1
+                spacing: 0
+
+                Rectangle {
+                    Layout.preferredHeight: 1
+                    Layout.preferredWidth: 1
+                    color: grid.borderColor
+                }
+
+                Rectangle {
+                    Layout.fillHeight: true
+                    width: 1
+                    color: items.length > 0 && items[0].active ? grid.borderColor : "transparent";
+                }
+
+                Rectangle {
+                    color: grid.borderColor
+                    Layout.preferredHeight: 1
+                    Layout.preferredWidth: 1
+                }
+            }
+        }
+
+        Repeater {
+            id: repeater
+            model: items.length
+            property int currentIndex: 0
+            property int previousIndex: 0
+
+            RowLayout {
+                spacing: 0
+
+                Rectangle {
+                    Layout.preferredWidth: 1
+                    Layout.preferredHeight: 32
+                    color: grid.borderColor
+                    visible: index > 0 && items[index - 1].visible
+                }
+
+                ColumnLayout {
+                    Layout.minimumWidth: 72
+                    Layout.preferredHeight: 32
+                    Layout.fillWidth: true
+                    spacing: 0
+                    visible: items[index].visible
+
+                    Rectangle {
+                        color: grid.borderColor
+                        Layout.preferredHeight: 1
+                        Layout.fillWidth: true
+                    }
+
+                    Rectangle {
+                        Layout.minimumHeight: 30
+                        Layout.fillWidth: true
+                        color: items[index].active ? grid.borderColor : "transparent"
+                        implicitHeight: children[0].implicitHeight
+                        implicitWidth: children[0].implicitWidth
+
+                        MoneroComponents.TextPlain {
+                            anchors.centerIn: parent
+                            font.family: grid.fontFamily
+                            font.pixelSize: grid.fontSize
+                            font.bold: grid.fontBold
+                            leftPadding: grid.textMargin / 2
+                            rightPadding: grid.textMargin / 2
+                            text: items[index].text
+                            color: items[index].active ? grid.fontColorActive : grid.fontColorInActive
+                            themeTransition: false
+                        }
+
+                        MouseArea {
+                            anchors.fill: parent
+                            hoverEnabled: true
+                            cursorShape: Qt.PointingHandCursor
+
+                            onClicked: {
+                                repeater.previousIndex = repeater.currentIndex;
+                                repeater.currentIndex = index;
+                                items[index].selected()
+                            }
+                        }
+                    }
+
+                    Rectangle {
+                        color: grid.borderColor
+                        Layout.preferredHeight: 1
+                        Layout.fillWidth: true
+                    }
+                }
+            }
+        }
+
+        Rectangle {
+            // navbar right side border
+            id: navBarRight
+            Layout.preferredWidth: 2
+            Layout.preferredHeight: 32
+            color: "transparent"
+            rotation: 180
+
+            Rectangle {
+                anchors.left: parent.left
+                anchors.verticalCenter: parent.verticalCenter
+                width: 1
+                height: parent.height - 2
+                color: grid.borderColor
+            }
+
+            ColumnLayout {
+                anchors.top: parent.top
+                anchors.bottom: parent.bottom
+                anchors.right: parent.right
+                width: 1
+                spacing: 0
+
+                Rectangle {
+                    Layout.preferredHeight: 1
+                    Layout.preferredWidth: 1
+                    color: grid.borderColor
+                }
+
+                Rectangle {
+                    Layout.fillHeight: true
+                    width: 1
+                    color: items.length > 0 && items[items.length - 1].active ? grid.borderColor : "transparent"
+                }
+
+                Rectangle {
+                    color: grid.borderColor
+                    Layout.preferredHeight: 1
+                    Layout.preferredWidth: 1
+                }
+            }
+        }
+    }
+}

components/NavbarItem.qml

@@ -1,21 +1,21 @@
-// Copyright (c) 2014-2019, The Monero Project
-// 
+// Copyright (c) 2021, The Monero Project
+//
 // All rights reserved.
-// 
+//
 // Redistribution and use in source and binary forms, with or without modification, are
 // permitted provided that the following conditions are met:
-// 
+//
 // 1. Redistributions of source code must retain the above copyright notice, this list of
 //    conditions and the following disclaimer.
-// 
+//
 // 2. Redistributions in binary form must reproduce the above copyright notice, this list
 //    of conditions and the following disclaimer in the documentation and/or other
 //    materials provided with the distribution.
-// 
+//
 // 3. Neither the name of the copyright holder nor the names of its contributors may be
 //    used to endorse or promote products derived from this software without specific
 //    prior written permission.
-// 
+//
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
@@ -26,9 +26,12 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <assert.h>
+import QtQuick 2.9
 
-static_assert(1, "FAIL");
-int main(int argc, char *argv[]) {
-	return 0;
+QtObject {
+    property bool active: false
+    property string text
+    property bool visible: true
+
+    signal selected()
 }

components/NetworkStatusItem.qml

@@ -39,10 +39,21 @@ Rectangle {
     property var connected: Wallet.ConnectionStatus_Disconnected
 
     function getConnectionStatusString(status) {
+        switch (appWindow.daemonStartStopInProgress)
+        {
+            case 1:
+                return qsTr("Starting the node");
+            case 2:
+                return qsTr("Stopping the node");
+            default:
+                break;
+        }
         switch (status) {
             case Wallet.ConnectionStatus_Connected:
                 if (!appWindow.daemonSynced)
                     return qsTr("Synchronizing");
+                if (persistentSettings.useRemoteNode && persistentSettings.allowRemoteNodeMining && appWindow.isMining)
+                    return qsTr("Remote node") + " + " + qsTr("Mining");
                 if (persistentSettings.useRemoteNode)
                     return qsTr("Remote node");
                 return appWindow.isMining ? qsTr("Connected") + " + " + qsTr("Mining"): qsTr("Connected");
@@ -71,7 +82,7 @@ Rectangle {
                 if(item.connected == Wallet.ConnectionStatus_Connected){
                     return 1
                 } else {
-                    return 0.5
+                    MoneroComponents.Style.blackTheme ? 0.5 : 0.3
                 }
             }
 
@@ -83,7 +94,7 @@ Rectangle {
                 source: {
                     if(appWindow.isMining) {
                        return "qrc:///images/miningxmr.png"
-                    } else if(item.connected == Wallet.ConnectionStatus_Connected) {
+                    } else if(item.connected == Wallet.ConnectionStatus_Connected || !MoneroComponents.Style.blackTheme) {
                         return "qrc:///images/lightning.png"
                     } else {
                         return "qrc:///images/lightning-white.png"
@@ -117,8 +128,8 @@ Rectangle {
                 font.family: MoneroComponents.Style.fontMedium.name
                 font.bold: true
                 font.pixelSize: 13
-                color: MoneroComponents.Style.dimmedFontColor
-                opacity: MoneroComponents.Style.blackTheme ? 0.65 : 0.5
+                color: MoneroComponents.Style.blackTheme ? MoneroComponents.Style.dimmedFontColor : MoneroComponents.Style.defaultFontColor
+                opacity: MoneroComponents.Style.blackTheme ? 0.65 : 0.75
                 text: qsTr("Network status") + translationManager.emptyString
                 themeTransition: false
             }
@@ -150,16 +161,18 @@ Rectangle {
                 }
             }
 
-            Text {
+            MoneroComponents.TextPlain {
                 anchors.left: statusTextVal.right
                 anchors.leftMargin: 16
                 anchors.verticalCenter: parent.verticalCenter
-                color: refreshMouseArea.containsMouse ?  MoneroComponents.Style.dimmedFontColor : MoneroComponents.Style.defaultFontColor
+                color: refreshMouseArea.containsMouse ?  MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
                 font.family: FontAwesome.fontFamilySolid
                 font.pixelSize: 24
                 font.styleName: "Solid"
-                opacity: iconItem.opacity * (refreshMouseArea.visible ? 1 : 0.5)
+                opacity: 0.85
                 text: FontAwesome.random
+                themeTransition: false
+                tooltip: qsTr("Switch to another public remote node") + translationManager.emptyString;
                 visible: (
                     !appWindow.disconnected &&
                     !persistentSettings.useRemoteNode &&
@@ -172,6 +185,8 @@ Rectangle {
                     hoverEnabled: true
                     cursorShape: Qt.PointingHandCursor
                     visible: true
+                    onEntered: parent.tooltipPopup.open()
+                    onExited: parent.tooltipPopup.close()
                     onClicked: {
                         const callback = function(result) {
                             refreshMouseArea.visible = true;

components/PasswordDialog.qml

@@ -108,7 +108,11 @@ Item {
         leftPanel.enabled = true
         middlePanel.enabled = true
         wizard.enabled = true
-        titleBar.state = "default"
+        if (rootItem.state == "wizard") {
+            titleBar.state = "essentials"
+        } else {
+            titleBar.state = "default"
+        }
 
         root.visible = false;
         appWindow.hideBalanceForced = false;

components/QRCodeScanner.qml

@@ -90,6 +90,9 @@ Rectangle {
             if (!parsed.error) {
                 root.qrcode_decoded(parsed.address, parsed.payment_id, parsed.amount, parsed.tx_description, parsed.recipient_name, parsed.extra_parameters);
                 root.state = "Stopped";
+            } else if (walletManager.addressValid(data, appWindow.persistentSettings.nettype)) {
+                root.qrcode_decoded(data, "", "", "", "", null);
+                root.state = "Stopped";
             } else {
                 onNotifyError(parsed.error);
             }

components/RemoteNodeDialog.qml

@@ -0,0 +1,170 @@
+// Copyright (c) 2021, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.1
+
+import "." as MoneroComponents
+
+MoneroComponents.Dialog {
+    id: root
+    title: (editMode ? qsTr("Edit remote node") : qsTr("Add remote node")) + translationManager.emptyString
+
+    property var callbackOnSuccess: null
+    property bool editMode: false
+    property bool success: false
+
+    onActiveFocusChanged: activeFocus && remoteNodeAddress.forceActiveFocus()
+
+    function onOk() {
+        root.success = true;
+        root.close();
+    }
+
+    function onCancel() { root.close(); }
+
+    function add(callbackOnSuccess) {
+        root.editMode = false;
+        root.callbackOnSuccess = callbackOnSuccess;
+
+        open();
+    }
+
+    function edit(remoteNode, callbackOnSuccess) {
+        const hostPort = remoteNode.address.match(/^(.*?)(?:\:?(\d*))$/);
+        if (hostPort) {
+            remoteNodeAddress.daemonAddrText = hostPort[1];
+            remoteNodeAddress.daemonPortText = hostPort[2];
+        }
+        daemonUsername.text = remoteNode.username;
+        daemonPassword.text = remoteNode.password;
+        setTrustedDaemonCheckBox.checked = remoteNode.trusted;
+        root.callbackOnSuccess = callbackOnSuccess;
+        root.editMode = true;
+
+        open();
+    }
+
+    onClosed: {
+        if (root.success && callbackOnSuccess) {
+            callbackOnSuccess({
+                address: remoteNodeAddress.getAddress(),
+                username: daemonUsername.text,
+                password: daemonPassword.text,
+                trusted: setTrustedDaemonCheckBox.checked,
+            });
+        }
+
+        remoteNodeAddress.daemonAddrText = "";
+        remoteNodeAddress.daemonPortText = "";
+        daemonUsername.text = "";
+        daemonPassword.text = "";
+        setTrustedDaemonCheckBox.checked = false;
+        root.success = false;
+    }
+
+    MoneroComponents.RemoteNodeEdit {
+        id: remoteNodeAddress
+        Layout.fillWidth: true
+        placeholderFontSize: 15
+
+        daemonAddrLabelText: qsTr("Address") + translationManager.emptyString
+        daemonPortLabelText: qsTr("Port") + translationManager.emptyString
+
+        Keys.enabled: root.visible
+        Keys.onEnterPressed: root.onOk()
+        Keys.onReturnPressed: root.onOk()
+        Keys.onEscapePressed: root.onCancel()
+    }
+
+    RowLayout {
+        Layout.fillWidth: true
+        spacing: 32
+
+        MoneroComponents.LineEdit {
+            id: daemonUsername
+            Layout.fillWidth: true
+            Layout.minimumWidth: 220
+            labelText: qsTr("Daemon username") + translationManager.emptyString
+            placeholderText: qsTr("(optional)") + translationManager.emptyString
+            placeholderFontSize: 15
+            labelFontSize: 14
+            fontSize: 15
+        }
+
+        MoneroComponents.LineEdit {
+            id: daemonPassword
+            Layout.fillWidth: true
+            Layout.minimumWidth: 220
+            labelText: qsTr("Daemon password") + translationManager.emptyString
+            placeholderText: qsTr("Password") + translationManager.emptyString
+            password: true
+            placeholderFontSize: 15
+            labelFontSize: 14
+            fontSize: 15
+
+            Keys.enabled: root.visible
+            Keys.onEnterPressed: root.onOk()
+            Keys.onReturnPressed: root.onOk()
+            Keys.onEscapePressed: root.onCancel()
+        }
+    }
+
+    MoneroComponents.CheckBox {
+        id: setTrustedDaemonCheckBox
+        activeFocusOnTab: true
+        text: qsTr("Mark as Trusted Daemon") + translationManager.emptyString
+    }
+
+    RowLayout {
+        Layout.alignment: Qt.AlignRight
+        spacing: parent.spacing
+
+        MoneroComponents.StandardButton {
+            activeFocusOnTab: true
+            fontBold: false
+            primary: false
+            text: qsTr("Cancel")  + translationManager.emptyString
+
+            onClicked: root.close()
+        }
+
+        MoneroComponents.StandardButton {
+            activeFocusOnTab: true
+            fontBold: false
+            enabled: remoteNodeAddress.getAddress() != ""
+            text: qsTr("Ok") + translationManager.emptyString
+
+            onClicked: {
+                root.success = true;
+                root.close();
+            }
+        }
+    }
+}

components/RemoteNodeEdit.qml

@@ -56,7 +56,6 @@ GridLayout {
     property int labelFontSize: 14
 
     property string lineEditBackgroundColor: "transparent"
-    property string lineEditBorderColor: MoneroComponents.Style.inputBorderColorInActive
     property string lineEditFontColor: MoneroComponents.Style.defaultFontColor
     property bool lineEditFontBold: false
     property int lineEditFontSize: 15
@@ -67,24 +66,25 @@ GridLayout {
     signal editingFinished()
     signal textChanged()
 
+    onActiveFocusChanged: activeFocus && daemonAddr.forceActiveFocus()
+
     function isValid() {
         return daemonAddr.text.trim().length > 0 && daemonPort.acceptableInput
     }
 
     function getAddress() {
+        if (!isValid()) {
+            return "";
+        }
+
         var addr = daemonAddr.text.trim();
         var port = daemonPort.text.trim();
-
-        // validation
-        if(addr === "" || addr.length < 2) return "";
-        if(!Utils.isNumeric(port)) return "";
-
         return addr + ":" + port;
     }
 
-    LineEdit {
+    MoneroComponents.LineEdit {
         id: daemonAddr
-        Layout.fillWidth: true
+        Layout.preferredWidth: root.width/3
         placeholderText: qsTr("Remote Node Hostname / IP") + translationManager.emptyString
         placeholderFontFamily: root.placeholderFontFamily
         placeholderFontBold: root.placeholderFontBold
@@ -92,7 +92,6 @@ GridLayout {
         placeholderColor: root.placeholderColor
         placeholderOpacity: root.placeholderOpacity
         labelFontSize: root.labelFontSize
-        borderColor: lineEditBorderColor
         backgroundColor: lineEditBackgroundColor
         fontColor: lineEditFontColor
         fontBold: lineEditFontBold
@@ -105,9 +104,9 @@ GridLayout {
         text: initialHostPort[1]
     }
 
-    LineEdit {
+    MoneroComponents.LineEdit {
         id: daemonPort
-        Layout.fillWidth: true
+        Layout.preferredWidth: root.width/3
         placeholderText: qsTr("Port") + translationManager.emptyString
         placeholderFontFamily: root.placeholderFontFamily
         placeholderFontBold: root.placeholderFontBold
@@ -115,7 +114,6 @@ GridLayout {
         placeholderColor: root.placeholderColor
         placeholderOpacity: root.placeholderOpacity
         labelFontSize: root.labelFontSize
-        borderColor: lineEditBorderColor
         backgroundColor: lineEditBackgroundColor
         fontColor: lineEditFontColor
         fontBold: lineEditFontBold

components/RemoteNodeList.qml

@@ -0,0 +1,167 @@
+// Copyright (c) 2021, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.9
+import QtQuick.Layouts 1.1
+
+import FontAwesome 1.0
+
+import "." as MoneroComponents
+import "effects/" as MoneroEffects
+
+ColumnLayout {
+    id: remoteNodeList
+    spacing: 20
+
+    MoneroComponents.CheckBox {
+        border: false
+        checkedIcon: FontAwesome.minusCircle
+        uncheckedIcon: FontAwesome.plusCircle
+        fontAwesomeIcons: true
+        fontSize: 16
+        iconOnTheLeft: true
+        text: qsTr("Add remote node") + translationManager.emptyString
+        toggleOnClick: false
+        onClicked: remoteNodeDialog.add(remoteNodesModel.append)
+    }
+
+    ColumnLayout {
+        spacing: 0
+
+        Repeater {
+            model: remoteNodesModel
+
+            Rectangle {
+                height: 30
+                Layout.fillWidth: true
+                color: itemMouseArea.containsMouse || trustedDaemonCheckMark.labelMouseArea.containsMouse || index === remoteNodesModel.selected ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent"
+
+                Rectangle {
+                    visible: index === remoteNodesModel.selected
+                    Layout.fillHeight: true
+                    anchors.top: parent.top
+                    anchors.bottom: parent.bottom
+                    color: "darkgrey"
+                    width: 2
+                }
+
+                Rectangle {
+                    color: MoneroComponents.Style.appWindowBorderColor
+                    anchors.right: parent.right
+                    anchors.left: parent.left
+                    anchors.top: parent.top
+                    height: 1
+                    visible: index > 0
+
+                    MoneroEffects.ColorTransition {
+                        targetObj: parent
+                        blackColor: MoneroComponents.Style._b_appWindowBorderColor
+                        whiteColor: MoneroComponents.Style._w_appWindowBorderColor
+                    }
+                }
+
+                Rectangle {
+                    anchors.fill: parent
+                    anchors.rightMargin: 80
+                    color: "transparent"
+                    property var trusted: remoteNodesModel.get(index) ? remoteNodesModel.get(index).trusted : false
+
+                    MoneroComponents.TextPlain {
+                        id: addressText
+                        width: parent.width - trustedDaemonCheckMark.width
+                        color: index === remoteNodesModel.selected ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.left: parent.left
+                        anchors.leftMargin: 6
+                        font.pixelSize: 16
+                        text: address
+                        themeTransition: false
+                        elide: Text.ElideMiddle
+                    }
+
+                    MoneroComponents.Label {
+                        id: trustedDaemonCheckMark
+                        anchors.left: addressText.right
+                        anchors.leftMargin: 3
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.verticalCenterOffset: 2
+                        z: itemMouseArea.z + 1
+                        fontSize: 16
+                        fontFamily: FontAwesome.fontFamilySolid
+                        fontColor: index === remoteNodesModel.selected ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
+                        styleName: "Solid"
+                        visible: trusted
+                        text: FontAwesome.shieldAlt
+                        tooltip: qsTr("Trusted daemon") + translationManager.emptyString
+                        themeTransition: false
+                    }
+
+                    MouseArea {
+                        id: itemMouseArea
+                        cursorShape: Qt.PointingHandCursor
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        onClicked: remoteNodesModel.applyRemoteNode(index)
+                    }
+                }
+
+                RowLayout {
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.right: parent.right
+                    height: 30
+                    spacing: 2
+
+                    MoneroComponents.InlineButton {
+                        buttonColor: "transparent"
+                        fontFamily: FontAwesome.fontFamily
+                        fontPixelSize: 18
+                        text: FontAwesome.edit
+                        tooltip: qsTr("Edit remote node") + translationManager.emptyString
+                        tooltipLeft: true
+                        onClicked: remoteNodeDialog.edit(remoteNodesModel.get(index), function (remoteNode) {
+                            remoteNodesModel.set(index, remoteNode)
+                            if (index === remoteNodesModel.selected) {
+                                remoteNodesModel.applyRemoteNode(index)
+                            }
+                        })
+                    }
+
+                    MoneroComponents.InlineButton {
+                        buttonColor: "transparent"
+                        fontFamily: FontAwesome.fontFamily
+                        text: FontAwesome.times
+                        visible: remoteNodesModel.count > 1
+                        tooltip: qsTr("Remove remote node") + translationManager.emptyString
+                        tooltipLeft: true
+                        onClicked: remoteNodesModel.removeSelectNextIfNeeded(index)
+                    }
+                }
+            }
+        }
+    }
+}

components/SettingsListItem.qml

@@ -7,9 +7,11 @@ import "../components" as MoneroComponents
 ColumnLayout {
     id: settingsListItem
     property alias iconText: iconLabel.text
+    property alias symbol: symbolText.text
     property alias description: area.text
     property alias title: header.text
     property bool isLast: false
+    property bool enabled: true
     signal clicked()
 
     Layout.fillWidth: true
@@ -37,6 +39,7 @@ ColumnLayout {
             width: parent.width
             height: header.height + area.contentHeight
             color: "transparent";
+            opacity: settingsListItem.enabled ? 1 : 0.25
             anchors.left: parent.left
             anchors.bottomMargin: 4
             anchors.topMargin: 4
@@ -102,6 +105,7 @@ ColumnLayout {
         }
 
         MouseArea {
+            visible: settingsListItem.enabled
             cursorShape: Qt.PointingHandCursor
             anchors.fill: parent
             hoverEnabled: true
@@ -111,5 +115,17 @@ ColumnLayout {
                 settingsListItem.clicked()
             }
         }
+
+        MoneroComponents.TextPlain {
+            id: symbolText
+            anchors.right: parent.right
+            anchors.rightMargin: 44
+            anchors.verticalCenter: parent.verticalCenter
+            font.pixelSize: 12
+            font.bold: true
+            color: MoneroComponents.Style.menuButtonTextColor
+            visible: appWindow.ctrlPressed
+            themeTransition: false
+        }
     }
 }

components/Slider.qml

@@ -16,11 +16,11 @@ ColumnLayout {
 
     spacing: 0
 
-    Text {
+    MoneroComponents.TextPlain {
         id: label
         color: MoneroComponents.Style.defaultFontColor
         font.pixelSize: 14
-        Layout.fillWidth: true
+        font.family: MoneroComponents.Style.fontRegular.name
     }
 
     QtQuickControls.Slider {

components/StandardButton.qml

@@ -39,19 +39,18 @@ Item {
     property bool primary: true
     property string rightIcon: ""
     property string rightIconInactive: ""
-    property color textColor: !button.enabled
-        ? MoneroComponents.Style.buttonTextColorDisabled
-        : primary
-        ? MoneroComponents.Style.buttonTextColor
-        : MoneroComponents.Style.buttonSecondaryTextColor;
+    property color textColor: primary ? MoneroComponents.Style.buttonTextColor : MoneroComponents.Style.buttonSecondaryTextColor;
     property bool small: false
     property alias text: label.text
     property alias fontBold: label.font.bold
     property int fontSize: {
-        if(small) return 14;
+        if(small) return 13.5;
         else return 16;
     }
     property alias label: label
+    property alias tooltip: tooltip.text
+    property alias tooltipLeft: tooltip.tooltipLeft
+    property alias tooltipPopup: tooltip.tooltipPopup
     signal clicked()
 
     height: small ?  30 : 36
@@ -68,7 +67,8 @@ Item {
         id: buttonRect
         anchors.fill: parent
         radius: 3
-        border.width: parent.focus ? 1 : 0
+        border.width: parent.focus && parent.enabled ? 1 : 0
+        opacity: 1
 
         state: button.enabled ? "active" : "disabled"
         Component.onCompleted: state = state
@@ -76,7 +76,7 @@ Item {
         states: [
             State {
                 name: "hover"
-                when: buttonArea.containsMouse || button.focus
+                when: button.enabled && (buttonArea.containsMouse || button.focus)
                 PropertyChanges {
                     target: buttonRect
                     color: primary
@@ -99,7 +99,14 @@ Item {
                 when: !button.enabled
                 PropertyChanges {
                     target: buttonRect
-                    color: MoneroComponents.Style.buttonBackgroundColorDisabled
+                    opacity: 0.5
+                    color: primary
+                        ? MoneroComponents.Style.buttonBackgroundColor
+                        : MoneroComponents.Style.buttonSecondaryBackgroundColor
+                }
+                PropertyChanges {
+                    target: label
+                    opacity: 0.5
                 }
             }
         ]
@@ -119,7 +126,7 @@ Item {
         MoneroComponents.TextPlain {
             id: label
             font.family: MoneroComponents.Style.fontBold.name
-            font.bold: true
+            font.bold: button.primary ? true : false
             font.pixelSize: button.fontSize
             color: !buttonArea.pressed ? button.textColor : "transparent"
             visible: text !== ""
@@ -142,7 +149,9 @@ Item {
             Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
             width: button.small ? 16 : 20
             height: button.small ? 16 : 20
+            opacity: buttonRect.opacity
             source: {
+                if (fontAwesomeIcon) return "";
                 if(button.rightIconInactive !== "" && !button.enabled) {
                     return button.rightIconInactive;
                 }
@@ -161,11 +170,18 @@ Item {
         }
     }
 
+    MoneroComponents.Tooltip {
+        id: tooltip
+        anchors.fill: parent
+    }
+
     MouseArea {
         id: buttonArea
         anchors.fill: parent
         hoverEnabled: true
         onClicked: doClick()
+        onEntered: tooltip.text ? tooltip.tooltipPopup.open() : ""
+        onExited: tooltip.text ? tooltip.tooltipPopup.close() : ""
         cursorShape: Qt.PointingHandCursor
     }
 

components/StandardDialog.qml

@@ -171,6 +171,7 @@ Rectangle {
 
             MoneroComponents.StandardButton {
                 id: cancelButton
+                primary: false
                 text: qsTr("Cancel") + translationManager.emptyString
                 onClicked: {
                     root.close()

components/StandardDropdown.qml

@@ -29,12 +29,16 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
+import FontAwesome 1.0
+import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
 import "../components/effects/" as MoneroEffects
 
-Item {
+ColumnLayout {
     id: dropdown
+    Layout.fillWidth: true
+
     property int itemTopMargin: 0
     property alias dataModel: repeater.model
     property string shadowPressedColor
@@ -44,46 +48,66 @@ Item {
     property string textColor: MoneroComponents.Style.defaultFontColor
     property alias currentIndex: columnid.currentIndex
     readonly property alias expanded: popup.visible
-    property int dropdownHeight: 42
-    property int fontHeaderSize: 16
+    property alias labelText: dropdownLabel.text
+    property alias labelColor: dropdownLabel.color
+    property alias labelTextFormat: dropdownLabel.textFormat
+    property alias labelWrapMode: dropdownLabel.wrapMode
+    property alias labelHorizontalAlignment: dropdownLabel.horizontalAlignment
+    property bool showingHeader: dropdownLabel.text !== ""
+    property int labelFontSize: 14
+    property bool labelFontBold: false
+    property int dropdownHeight: 39
+    property int fontSize: 14
     property int fontItemSize: 14
     property string colorBorder: MoneroComponents.Style.inputBorderColorInActive
     property string colorHeaderBackground: "transparent"
     property bool headerBorder: true
     property bool headerFontBold: false
 
-    height: dropdownHeight
-
     signal changed();
 
     onExpandedChanged: if(expanded) appWindow.currentItem = dropdown
 
-    Item {
-        id: head
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.topMargin: parent.itemTopMargin
-        height: dropdown.dropdownHeight
+    spacing: 0
+    Rectangle {
+        id: dropdownLabelRect
+        color: "transparent"
+        Layout.fillWidth: true
+        height: (dropdownLabel.height + 10)
+        visible: showingHeader ? true : false
 
-        Rectangle {
-            color: "transparent"
-            border.width: dropdown.headerBorder ? 1 : 0
-            border.color: dropdown.colorBorder
-            radius: 4
-            anchors.fill: parent
+        MoneroComponents.TextPlain {
+            id: dropdownLabel
+            anchors.top: parent.top
+            anchors.left: parent.left
+            font.family: MoneroComponents.Style.fontRegular.name
+            font.pixelSize: labelFontSize
+            font.bold: labelFontBold
+            textFormat: Text.RichText
+            color: MoneroComponents.Style.defaultFontColor
         }
+    }
+
+    Rectangle {
+        id: head
+        color: dropArea.containsMouse ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent"
+        border.width: dropdown.headerBorder ? 1 : 0
+        border.color: dropdown.colorBorder
+        radius: 4
+        Layout.fillWidth: true
+        Layout.preferredHeight: dropdownHeight
 
         MoneroComponents.TextPlain {
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
-            anchors.leftMargin: 12
+            anchors.leftMargin: 10
             anchors.right: dropIndicator.left
             anchors.rightMargin: 12
+            width: droplist.width
             elide: Text.ElideRight
             font.family: MoneroComponents.Style.fontRegular.name
             font.bold: dropdown.headerFontBold
-            font.pixelSize: dropdown.fontHeaderSize
+            font.pixelSize: dropdown.fontSize
             color: dropdown.textColor
             text: columnid.currentIndex < repeater.model.count ? qsTr(repeater.model.get(columnid.currentIndex).column1) + translationManager.emptyString : ""
         }
@@ -96,19 +120,15 @@ Item {
             anchors.rightMargin: 12
             width: dropdownIcon.width
 
-            Image {
+            MoneroEffects.ImageMask {
                 id: dropdownIcon
                 anchors.centerIn: parent
-                source: "qrc:///images/whiteDropIndicator.png"
-                visible: false
-            }
-
-            ColorOverlay {
-                source: dropdownIcon
-                anchors.fill: dropdownIcon
+                image: "qrc:///images/whiteDropIndicator.png"
+                height: 8
+                width: 12
+                fontAwesomeFallbackIcon: FontAwesome.arrowDown
+                fontAwesomeFallbackSize: 14
                 color: MoneroComponents.Style.defaultFontColor
-                rotation: dropdown.expanded ? 180  : 0
-                opacity: 1
             }
         }
 
@@ -117,7 +137,7 @@ Item {
             anchors.fill: parent
             onClicked: dropdown.expanded ? popup.close() : popup.open()
             hoverEnabled: true
-            cursorShape: Qt.PointingHandCursor
+            cursorShape: Qt.ArrowCursor
         }
     }
 
@@ -128,7 +148,7 @@ Item {
 
         Rectangle {
             id: droplist
-            x: dropdown.x
+            anchors.left: parent.left
             width: dropdown.width
             y: head.y + head.height
             clip: true
@@ -171,7 +191,7 @@ Item {
                             anchors.leftMargin: 12
                             anchors.rightMargin: 0
                             font.family: MoneroComponents.Style.fontRegular.name
-                            font.bold: true
+                            font.bold: false
                             font.pixelSize: fontItemSize
                             color: itemArea.containsMouse || index === columnid.currentIndex || itemArea.containsMouse ? "#FA6800" : "#FFFFFF"
                             text: qsTr(column1) + translationManager.emptyString
@@ -188,25 +208,11 @@ Item {
                             text: ""
                         }
 
-                        Rectangle {
-                            anchors.left: parent.left
-                            anchors.top: parent.top
-                            width: 3; height: 3
-                            color: parent.color
-                        }
-
-                        Rectangle {
-                            anchors.right: parent.right
-                            anchors.top: parent.top
-                            width: 3; height: 3
-                            color: parent.color
-                        }
-
                         MouseArea {
                             id: itemArea
                             anchors.fill: parent
                             hoverEnabled: true
-                            cursorShape: Qt.PointingHandCursor
+                            cursorShape: Qt.ArrowCursor
 
                             onClicked: {
                                 popup.close()

components/Style.qml

@@ -42,11 +42,12 @@ QtObject {
     property string buttonBackgroundColorDisabled: blackTheme ? _b_buttonBackgroundColorDisabled : _w_buttonBackgroundColorDisabled
     property string buttonBackgroundColorDisabledHover: blackTheme ? _b_buttonBackgroundColorDisabledHover : _w_buttonBackgroundColorDisabledHover
     property string buttonInlineBackgroundColor: blackTheme ? _b_buttonInlineBackgroundColor : _w_buttonInlineBackgroundColor
+    property string buttonInlineBackgroundColorHover: blackTheme ? _b_buttonInlineBackgroundColorHover : _w_buttonInlineBackgroundColorHover
     property string buttonTextColor: blackTheme ? _b_buttonTextColor : _w_buttonTextColor
     property string buttonTextColorDisabled: blackTheme ? _b_buttonTextColorDisabled : _w_buttonTextColorDisabled
-    property string buttonSecondaryBackgroundColor: "#d9d9d9"
-    property string buttonSecondaryBackgroundColorHover: "#a6a6a6"
-    property string buttonSecondaryTextColor: "#4d4d4d"
+    property string buttonSecondaryBackgroundColor: blackTheme ? _b_buttonSecondaryBackgroundColor : _w_buttonSecondaryBackgroundColor
+    property string buttonSecondaryBackgroundColorHover: blackTheme ? _b_buttonSecondaryBackgroundColorHover : _w_buttonSecondaryBackgroundColorHover
+    property string buttonSecondaryTextColor: blackTheme ? _b_buttonSecondaryTextColor : _w_buttonSecondaryTextColor
     property string dividerColor: blackTheme ? _b_dividerColor : _w_dividerColor
     property real dividerOpacity: blackTheme ? _b_dividerOpacity : _w_dividerOpacity
 
@@ -80,6 +81,7 @@ QtObject {
     property string leftPanelBackgroundGradientStart: blackTheme ? _b_leftPanelBackgroundGradientStart : _w_leftPanelBackgroundGradientStart
     property string leftPanelBackgroundGradientStop: blackTheme ? _b_leftPanelBackgroundGradientStop : _w_leftPanelBackgroundGradientStop
     property string historyHeaderTextColor: blackTheme ? _b_historyHeaderTextColor : _w_historyHeaderTextColor
+    property var accountColors: blackTheme ? _b_accountColors : _w_accountColors
 
     property string _b_defaultFontColor: "white"
     property string _b_dimmedFontColor: "#BBBBBB"
@@ -102,8 +104,12 @@ QtObject {
     property string _b_buttonBackgroundColorDisabled: "#707070"
     property string _b_buttonBackgroundColorDisabledHover: "#808080"
     property string _b_buttonInlineBackgroundColor: "#707070"
+    property string _b_buttonInlineBackgroundColorHover: "#808080"
     property string _b_buttonTextColor: "white"
     property string _b_buttonTextColorDisabled: "black"
+    property string _b_buttonSecondaryBackgroundColor: "#707070"
+    property string _b_buttonSecondaryBackgroundColorHover: "#808080"
+    property string _b_buttonSecondaryTextColor: "white"
     property string _b_dividerColor: "white"
     property real _b_dividerOpacity: 0.20
 
@@ -137,6 +143,7 @@ QtObject {
     property string _b_leftPanelBackgroundGradientStart: "#222222"
     property string _b_leftPanelBackgroundGradientStop: "#1a1a1a"
     property string _b_historyHeaderTextColor: "#C0C0C0"
+    property var _b_accountColors: ["#6E513C", "#842129", "#458421", "#742184", "#291DBE", "#846F21", "#217F84", "#696969"]
 
     property string _w_defaultFontColor: "black"
     property string _w_dimmedFontColor: "#3f3f3f"
@@ -158,9 +165,13 @@ QtObject {
     property string _w_buttonBackgroundColorHover: "#E65E00"
     property string _w_buttonBackgroundColorDisabled: "#bbbbbb"
     property string _w_buttonBackgroundColorDisabledHover: "#D1D1D1"
-    property string _w_buttonInlineBackgroundColor: "#bbbbbb"
+    property string _w_buttonInlineBackgroundColor: "#d9d9d9"
+    property string _w_buttonInlineBackgroundColorHover: "#C8C8C8"
     property string _w_buttonTextColor: "white"
     property string _w_buttonTextColorDisabled: "black"
+    property string _w_buttonSecondaryBackgroundColor: "#d9d9d9"
+    property string _w_buttonSecondaryBackgroundColorHover: "#C8C8C8"
+    property string _w_buttonSecondaryTextColor: "#4d4d4d"
     property string _w_dividerColor: "black"
     property real _w_dividerOpacity: 0.20
 
@@ -185,7 +196,7 @@ QtObject {
     property string _w_menuButtonImageRightColorActive: "#FA6800"
     property string _w_menuButtonImageRightColor: "#808080"
     property string _w_menuButtonImageDotArrowSource: "qrc:///images/arrow-right-medium-white.png"
-    property string _w_inlineButtonTextColor: "black"
+    property string _w_inlineButtonTextColor: "#4d4d4d"
     property string _w_inlineButtonBorderColor: "transparent"
     property string _w_appWindowBackgroundColor: "black"
     property string _w_appWindowBorderColor: "#dedede"
@@ -194,4 +205,5 @@ QtObject {
     property string _w_leftPanelBackgroundGradientStart: "white"
     property string _w_leftPanelBackgroundGradientStop: "#f5f5f5"
     property string _w_historyHeaderTextColor: "#515151"
+    property var _w_accountColors: ["#6E513C", "#6E513C", "#842129", "#458421", "#742184", "#291DBE", "#846F21", "#217F84", "#696969"]
 }

components/SuccessfulTxDialog.qml

@@ -45,20 +45,11 @@ Rectangle {
     radius: 10
     border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25)
     border.width: 1
-    focus: true
     Keys.enabled: true
     Keys.onEscapePressed: {
         root.close()
         root.rejected()
     }
-    Keys.onEnterPressed: {
-        root.close()
-        root.accepted()
-    }
-    Keys.onReturnPressed: {
-        root.close()
-        root.accepted()
-    }
     KeyNavigation.tab: doneButton
 
     Clipboard { id: clipboard }
@@ -72,7 +63,6 @@ Rectangle {
     function open(txid) {
         root.transactionID = txid;
         root.visible = true;
-        root.forceActiveFocus();
     }
 
     function close() {
@@ -142,7 +132,7 @@ Rectangle {
             fontSize: 16
         }
 
-        // open folder / done buttons
+        // view progress / open folder / done buttons
         RowLayout {
             id: buttons
             spacing: 70
@@ -150,19 +140,26 @@ Rectangle {
             Layout.fillWidth: true
             Layout.preferredHeight: 50
 
+            MoneroComponents.StandardButton {
+                id: viewProgressButton
+                visible: !appWindow.viewOnly
+                text: qsTr("View progress") + translationManager.emptyString;
+                width: 200
+                primary: false
+                KeyNavigation.tab: doneButton
+                onClicked: {
+                    doSearchInHistory(root.transactionID);
+                    root.close()
+                    root.rejected()
+                }
+            }
+
             MoneroComponents.StandardButton {
                 id: openFolderButton
                 visible: appWindow.viewOnly
                 text: qsTr("Open folder") + translationManager.emptyString;
                 width: 200
                 KeyNavigation.tab: doneButton
-                Keys.enabled: openFolderButton.visible
-                Keys.onReturnPressed: openFolderButton.onClicked
-                Keys.onEnterPressed: openFolderButton.onClicked
-                Keys.onEscapePressed: {
-                    root.close()
-                    root.rejected()
-                }
                 onClicked: {
                     oshelper.openContainingFolder(walletManager.urlToLocalPath(saveTxDialog.fileUrl))
                 }
@@ -172,15 +169,8 @@ Rectangle {
                 id: doneButton
                 text: qsTr("Done") + translationManager.emptyString;
                 width: 200
-                focus: true
-                KeyNavigation.tab: openFolderButton
-                Keys.enabled: doneButton.visible
-                Keys.onReturnPressed: doneButton.onClicked
-                Keys.onEnterPressed: doneButton.onClicked
-                Keys.onEscapePressed: {
-                    root.close()
-                    root.rejected()
-                }
+                focus: root.visible
+                KeyNavigation.tab: appWindow.viewOnly ? openFolderButton : viewProgressButton
                 onClicked: {
                     root.close()
                     root.accepted()

components/TextPlain.qml

@@ -12,6 +12,10 @@ Text {
     property bool themeTransition: true
     property string themeTransitionBlackColor: ""
     property string themeTransitionWhiteColor: ""
+    property alias tooltip: tooltip.text
+    property alias tooltipLeft: tooltip.tooltipLeft
+    property alias tooltipIconVisible: tooltip.tooltipIconVisible
+    property alias tooltipPopup: tooltip.tooltipPopup
     font.family: MoneroComponents.Style.fontMedium.name
     font.bold: false
     font.pixelSize: 14
@@ -25,4 +29,10 @@ Text {
         blackColor: root.themeTransitionBlackColor !== "" ? root.themeTransitionBlackColor : MoneroComponents.Style._b_defaultFontColor
         whiteColor: root.themeTransitionWhiteColor !== "" ? root.themeTransitionWhiteColor : MoneroComponents.Style._w_defaultFontColor
     }
+
+    MoneroComponents.Tooltip {
+        id: tooltip
+        anchors.top: parent.top
+        anchors.left: tooltipIconVisible ? parent.right : parent.left
+    }
 }

components/TitleBar.qml

@@ -57,17 +57,20 @@ Rectangle {
     signal minimizeClicked
     signal languageClicked
     signal closeWalletClicked
+    signal lockWalletClicked
 
     state: "default"
     states: [
         State {
             name: "default";
             PropertyChanges { target: btnCloseWallet; visible: true}
+            PropertyChanges { target: btnLockWallet; visible: true}
             PropertyChanges { target: btnLanguageToggle; visible: true}
         }, State {
             // show only theme switcher and window controls
             name: "essentials";
             PropertyChanges { target: btnCloseWallet; visible: false}
+            PropertyChanges { target: btnLockWallet; visible: false}
             PropertyChanges { target: btnLanguageToggle; visible: false}
         }
     ]
@@ -91,6 +94,46 @@ Rectangle {
         spacing: 0
         anchors.fill: parent
 
+        // lock wallet
+        Rectangle {
+            id: btnLockWallet
+            color: "transparent"
+            Layout.preferredWidth: parent.height
+            Layout.preferredHeight: parent.height
+
+            Text {
+                text: FontAwesome.lock
+                font.family: FontAwesome.fontFamilySolid
+                font.pixelSize: 16
+                color: MoneroComponents.Style.defaultFontColor
+                font.styleName: "Solid"
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                opacity: 0.75
+            }
+
+            MoneroComponents.Tooltip {
+                id: btnLockWalletTooltip
+                anchors.fill: parent
+                text: qsTr("Lock this wallet") + translationManager.emptyString
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onEntered: {
+                    parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                    btnLockWalletTooltip.tooltipPopup.open()
+                }
+                onExited: {
+                    parent.color = "transparent"
+                    btnLockWalletTooltip.tooltipPopup.close()
+                }
+                onClicked: root.lockWalletClicked(leftPanel.visible)
+            }
+        }
+
         // collapse sidebar
         Rectangle {
             id: btnCloseWallet
@@ -110,12 +153,24 @@ Rectangle {
                 opacity: 0.75
             }
 
+            MoneroComponents.Tooltip {
+                id: btnCloseWalletTooltip
+                anchors.fill: parent
+                text: qsTr("Close this wallet and return to main menu") + translationManager.emptyString
+            }
+
             MouseArea {
                 anchors.fill: parent
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
-                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
-                onExited: parent.color = "transparent"
+                onEntered: {
+                    parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                    btnCloseWalletTooltip.tooltipPopup.open()
+                }
+                onExited: {
+                    parent.color = "transparent"
+                    btnCloseWalletTooltip.tooltipPopup.close()
+                }
                 onClicked: root.closeWalletClicked(leftPanel.visible)
             }
         }
@@ -138,12 +193,24 @@ Rectangle {
                 opacity: 0.75
             }
 
+            MoneroComponents.Tooltip {
+                id: btnLanguageToggleTooltip
+                anchors.fill: parent
+                text: qsTr("Change language") + translationManager.emptyString
+            }
+
             MouseArea {
                 anchors.fill: parent
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
-                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
-                onExited: parent.color = "transparent"
+                onEntered: {
+                    parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                    btnLanguageToggleTooltip.tooltipPopup.open()
+                }
+                onExited: {
+                    parent.color = "transparent"
+                    btnLanguageToggleTooltip.tooltipPopup.close()
+                }
                 onClicked: root.languageClicked()
             }
         }
@@ -165,15 +232,26 @@ Rectangle {
                 opacity: 0.75
             }
 
+            MoneroComponents.Tooltip {
+                id: btnSwitchThemeTooltip
+                anchors.fill: parent
+                text: MoneroComponents.Style.blackTheme ? qsTr("Switch to light theme") : qsTr("Switch to dark theme") + translationManager.emptyString
+            }
+
             MouseArea {
                 anchors.fill: parent
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
-                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
-                onExited: parent.color = "transparent"
+                onEntered: {
+                    parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                    btnSwitchThemeTooltip.tooltipPopup.open()
+                }
+                onExited: {
+                    parent.color = "transparent"
+                    btnSwitchThemeTooltip.tooltipPopup.close()
+                }
                 onClicked: {
                     MoneroComponents.Style.blackTheme = !MoneroComponents.Style.blackTheme;
-                    persistentSettings.blackTheme = MoneroComponents.Style.blackTheme;
                 }
             }
         }
@@ -347,6 +425,7 @@ Rectangle {
         anchors.fill: parent
         propagateComposedEvents: true
         onPressed: previousPosition = globalCursor.getPosition()
+        onDoubleClicked: root.maximizeClicked()
         onPositionChanged: {
             if (pressedButtons == Qt.LeftButton) {
                 var pos = globalCursor.getPosition()

components/Tooltip.qml

@@ -0,0 +1,112 @@
+// Copyright (c) 2021, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.1
+
+import FontAwesome 1.0
+import "." as MoneroComponents
+
+Rectangle {
+    property alias text: tooltip.text
+    property alias tooltipPopup: popup
+    property bool tooltipIconVisible: false
+    property bool tooltipLeft: false
+    property bool tooltipBottom: tooltipIconVisible ? false : true
+
+    color: "transparent"
+    height: tooltipIconVisible ? icon.height : parent.height
+    width: tooltipIconVisible ? icon.width : parent.width
+    visible: text != ""
+
+    Text {
+        id: icon
+        visible: tooltipIconVisible
+        color: MoneroComponents.Style.defaultFontColor
+        font.family: FontAwesome.fontFamily
+        font.pixelSize: 10
+        font.styleName: "Regular"
+        leftPadding: 5
+        rightPadding: 5
+        text: FontAwesome.questionCircle
+        opacity: mouseArea.containsMouse ? 0.7 : 1
+
+        MouseArea {
+            id: mouseArea
+            anchors.fill: parent
+            hoverEnabled: true
+            cursorShape: Qt.WhatsThisCursor
+            onEntered: popup.open()
+            onExited: popup.close()
+        }
+    }
+
+    ToolTip {
+        id: popup
+        height: tooltip.height + 20
+
+        background: Rectangle {
+            border.color: MoneroComponents.Style.buttonInlineBackgroundColor
+            border.width: 1
+            color: MoneroComponents.Style.titleBarBackgroundGradientStart
+            radius: 4
+        }
+        closePolicy: Popup.NoAutoClose
+        padding: 10
+        x: tooltipLeft
+            ? (tooltipIconVisible ? icon.x - icon.width : parent.x - tooltip.width - 20 + parent.width/2)
+            : (tooltipIconVisible ? icon.x + icon.width : parent.x + parent.width/2)
+        y: tooltipBottom
+            ? (tooltipIconVisible ? icon.y + height : parent.y + parent.height + 2)
+            : (tooltipIconVisible ? icon.y - height : parent.y - tooltip.height - 20)
+        enter: Transition {
+            NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 150 }
+        }
+
+        exit: Transition {
+            NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 150 }
+        }
+        delay: 200
+
+        RowLayout {
+            Layout.maximumWidth: 370
+
+            Text {
+                id: tooltip
+                width: contentWidth
+                Layout.maximumWidth: 370
+                color: MoneroComponents.Style.defaultFontColor
+                font.family: MoneroComponents.Style.fontRegular.name
+                font.pixelSize: 12
+                textFormat: Text.RichText
+                wrapMode: Text.WordWrap
+            }
+        }
+    }
+}

components/TxConfirmationDialog.qml

@@ -0,0 +1,441 @@
+// Copyright (c) 2014-2020, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.9
+import QtQuick.Controls 1.4 as QtQuickControls1
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.1
+
+import "../components" as MoneroComponents
+import FontAwesome 1.0
+
+Rectangle {
+    id: root
+
+    property int margins: 25
+
+    x: parent.width/2 - root.width/2
+    y: parent.height/2 - root.height/2
+    // TODO: implement without hardcoding sizes
+    width: 590
+    height: layout.height + layout.anchors.margins * 2
+    color: MoneroComponents.Style.blackTheme ? "black" : "white"
+    visible: false
+    radius: 10
+    border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25)
+    border.width: 1
+    Keys.enabled: true
+    Keys.onEscapePressed: {
+        root.close()
+        root.clearFields()
+        root.rejected()
+    }
+    KeyNavigation.tab: confirmButton
+
+    property var recipients: []
+    property var transactionAmount: ""
+    property var transactionDescription: ""
+    property var transactionFee: ""
+    property var transactionPriority: ""
+    property bool sweepUnmixable: false
+    property alias errorText: errorText
+    property alias confirmButton: confirmButton
+    property alias backButton: backButton
+    property alias bottomText: bottomText
+    property alias bottomTextAnimation: bottomTextAnimation
+
+    state: "default"
+    states: [
+        State {
+            // waiting for user action, show tx details + back and confirm buttons
+            name: "default";
+            when: errorText.text == "" && bottomText.text == ""
+            PropertyChanges { target: errorText; visible: false }
+            PropertyChanges { target: txAmountText; visible: root.transactionAmount !== "(all)" || (root.transactionAmount === "(all)" && currentWallet.isHwBacked() === true) }
+            PropertyChanges { target: txAmountBusyIndicator; visible: !txAmountText.visible }
+            PropertyChanges { target: txFiatAmountText; visible: txAmountText.visible && persistentSettings.fiatPriceEnabled && root.transactionAmount !== "(all)" }
+            PropertyChanges { target: txDetails; visible: true }
+            PropertyChanges { target: bottom; visible: true }
+            PropertyChanges { target: bottomMessage; visible: false }
+            PropertyChanges { target: buttons; visible: true }
+            PropertyChanges { target: backButton; visible: true; primary: false }
+            PropertyChanges { target: confirmButton; visible: true; focus: true }
+        }, State {
+            // error message being displayed, show only back button
+            name: "error";
+            when: errorText.text !== ""
+            PropertyChanges { target: dialogTitle; text: "Error" }
+            PropertyChanges { target: errorText; visible: true }
+            PropertyChanges { target: txAmountText; visible: false }
+            PropertyChanges { target: txAmountBusyIndicator; visible: false }
+            PropertyChanges { target: txFiatAmountText; visible: false }
+            PropertyChanges { target: txDetails; visible: false }
+            PropertyChanges { target: bottom; visible: true }
+            PropertyChanges { target: bottomMessage; visible: false }
+            PropertyChanges { target: buttons; visible: true }
+            PropertyChanges { target: backButton; visible: true; primary: true; focus: true }
+            PropertyChanges { target: confirmButton; visible: false }
+        }, State {
+            // creating or sending transaction, show tx details and don't show any button
+            name: "bottomText";
+            when: errorText.text == "" && bottomText.text !== ""
+            PropertyChanges { target: errorText; visible: false }
+            PropertyChanges { target: txAmountText; visible: root.transactionAmount !== "(all)" || (root.transactionAmount === "(all)" && currentWallet.isHwBacked() === true) }
+            PropertyChanges { target: txAmountBusyIndicator; visible: !txAmountText.visible }
+            PropertyChanges { target: txFiatAmountText; visible: txAmountText.visible && persistentSettings.fiatPriceEnabled && root.transactionAmount !== "(all)" }
+            PropertyChanges { target: txDetails; visible: true }
+            PropertyChanges { target: bottom; visible: true }
+            PropertyChanges { target: bottomMessage; visible: true }
+            PropertyChanges { target: buttons; visible: false }
+        }
+    ]
+
+    // same signals as Dialog has
+    signal accepted()
+    signal rejected()
+
+    function open() {
+        root.visible = true;
+
+        //clean previous error message
+        errorText.text = "";
+    }
+
+    function close() {
+        root.visible = false;
+    }
+
+    function clearFields() {
+        root.recipients = [];
+        root.transactionAmount = "";
+        root.transactionDescription = "";
+        root.transactionFee = "";
+        root.transactionPriority = "";
+        root.sweepUnmixable = false;
+    }
+
+    function showFiatConversion(valueXMR) {
+        const fiatFee = fiatApiConvertToFiat(valueXMR);
+        return "%1 %2".arg(fiatFee < 0.01 ? "&lt;0.01" : "~" + fiatFee).arg(fiatApiCurrencySymbol());
+    }
+
+    ColumnLayout {
+        id: layout
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.margins: parent.margins
+        spacing: 10
+
+        RowLayout {
+            Layout.topMargin: 10
+            Layout.fillWidth: true
+
+            MoneroComponents.Label {
+                id: dialogTitle
+                Layout.fillWidth: true
+                fontSize: 18
+                fontFamily: "Arial"
+                horizontalAlignment: Text.AlignHCenter
+                text: {
+                    if (appWindow.viewOnly) {
+                        return qsTr("Create transaction file") + translationManager.emptyString;
+                    } else if (root.sweepUnmixable) {
+                        return qsTr("Sweep unmixable outputs") + translationManager.emptyString;
+                    } else {
+                        return qsTr("Confirm send") + translationManager.emptyString;
+                    }
+                }
+            }
+        }
+
+        Text {
+            id: errorText
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            color: MoneroComponents.Style.defaultFontColor
+            wrapMode: Text.Wrap
+            font.pixelSize: 15
+        }
+
+        ColumnLayout {
+            spacing: 0
+            Layout.fillWidth: true
+            Layout.preferredHeight: 71
+
+            QtQuickControls1.BusyIndicator {
+                id: txAmountBusyIndicator
+                Layout.fillHeight: true
+                Layout.fillWidth: true
+                running: root.transactionAmount == "(all)"
+            }
+
+            Text {
+                id: txAmountText
+                Layout.fillWidth: true
+                horizontalAlignment: Text.AlignHCenter
+                font.pixelSize: root.transactionAmount == "(all)" && currentWallet.isHwBacked() === true ? 32 : 42
+                color: MoneroComponents.Style.defaultFontColor
+                text: {
+                    if (root.transactionAmount == "(all)" && currentWallet.isHwBacked() === true) {
+                        return qsTr("All unlocked balance") +  translationManager.emptyString;
+                    } else {
+                        return root.transactionAmount + " XMR " +  translationManager.emptyString;
+                    }
+                }
+            }
+
+            Text {
+                id: txFiatAmountText
+                Layout.fillWidth: true
+                horizontalAlignment: Text.AlignHCenter
+                font.pixelSize: 20
+                color: MoneroComponents.Style.buttonSecondaryTextColor
+                text: showFiatConversion(transactionAmount) + translationManager.emptyString
+            }
+        }
+
+        GridLayout {
+            columns: 2
+            id: txDetails
+            Layout.fillWidth: true
+            columnSpacing: 15
+            rowSpacing: 16
+
+            Text {
+                color: MoneroComponents.Style.dimmedFontColor
+                text: qsTr("From") + ":" + translationManager.emptyString
+                font.pixelSize: 15
+            }
+
+            ColumnLayout {
+                Layout.fillWidth: true
+                spacing: 16
+
+                Text {
+                    Layout.fillWidth: true
+                    font.pixelSize: 15
+                    color: MoneroComponents.Style.defaultFontColor
+                    text: {
+                        if (currentWallet) {
+                            var walletTitle = function() {
+                                if (currentWallet.isLedger()) {
+                                    return "Ledger";
+                                } else if (currentWallet.isTrezor()) {
+                                    return "Trezor";
+                                } else {
+                                    return qsTr("My wallet");
+                                }
+                            }
+                            var walletName = appWindow.walletName;
+                            if (appWindow.currentWallet.numSubaddressAccounts() > 1) {
+                                var currentSubaddressAccount = currentWallet.currentSubaddressAccount;
+                                var currentAccountLabel =  currentWallet.getSubaddressLabel(currentWallet.currentSubaddressAccount, 0);
+                                return walletTitle() + " (" + walletName + ")" + "<br>" + qsTr("Account #") + currentSubaddressAccount + (currentAccountLabel !== "" ? " (" + currentAccountLabel + ")" : "") + translationManager.emptyString;
+                            } else {
+                                return walletTitle() + " (" + walletName + ")" + translationManager.emptyString;
+                            }
+                        } else {
+                            return "";
+                        }
+                    }
+                }
+            }
+
+            Text {
+                font.pixelSize: 15
+                color: MoneroComponents.Style.dimmedFontColor
+                text: qsTr("To") + ":" + translationManager.emptyString
+            }
+
+            Flickable {
+                id: flickable
+                property int linesInMultipleRecipientsMode: 7
+                Layout.fillWidth: true
+                Layout.preferredHeight: recipients.length > 1
+                    ? linesInMultipleRecipientsMode * (recipientsArea.contentHeight / recipientsArea.lineCount)
+                    : recipientsArea.contentHeight
+                boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+                clip: true
+
+                TextArea.flickable: TextArea {
+                    id : recipientsArea
+                    color: MoneroComponents.Style.defaultFontColor
+                    font.family: MoneroComponents.Style.fontMonoRegular.name
+                    font.pixelSize: 14
+                    topPadding: 0
+                    bottomPadding: 0
+                    leftPadding: 0
+                    textMargin: 0
+                    readOnly: true
+                    selectByKeyboard: true
+                    selectByMouse: true
+                    selectionColor: MoneroComponents.Style.textSelectionColor
+                    textFormat: TextEdit.RichText
+                    wrapMode: TextEdit.Wrap
+                    text: {
+                        return recipients.map(function (recipient, index) {
+                            var addressBookName = null;
+                            if (currentWallet) {
+                                addressBookName = currentWallet.addressBook.getDescription(recipient.address);
+                            }
+                            var title;
+                            if (addressBookName) {
+                                title = FontAwesome.addressBook + " " + addressBookName;
+                            } else {
+                                title = qsTr("Monero address") + translationManager.emptyString;
+                            }
+                            if (recipients.length > 1) {
+                                title = "%1. %2 - %3 XMR".arg(index + 1).arg(title).arg(recipient.amount);
+                                if (persistentSettings.fiatPriceEnabled) {
+                                    title += " (%1)".arg(showFiatConversion(recipient.amount));
+                                }
+                            }
+                            const spacedaddress = recipient.address.match(/.{1,4}/g).join(' ');
+                            return title + "<br>" + spacedaddress;
+                        }).join("<br><br>");
+                    }
+                }
+
+                ScrollBar.vertical: ScrollBar {
+                    policy: recipientsArea.contentHeight > flickable.height ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff
+                }
+            }
+
+            Text {
+                color: MoneroComponents.Style.dimmedFontColor
+                text: qsTr("Fee") + ":" + translationManager.emptyString
+                font.pixelSize: 15
+            }
+
+            RowLayout {
+                Layout.fillWidth: true
+                spacing: 16
+
+                Text {
+                    property bool maliciousTxFee: parseFloat(root.transactionFee) > 0.01
+                    color: maliciousTxFee ? "red" : MoneroComponents.Style.defaultFontColor
+                    font.pixelSize: maliciousTxFee ? 20 : 15
+                    text: {
+                        if (currentWallet) {
+                            if (!root.transactionFee) {
+                                if (currentWallet.isHwBacked() === true) {
+                                    return qsTr("See on device") +  translationManager.emptyString;
+                                } else {
+                                    return qsTr("Calculating fee") + "..." +  translationManager.emptyString;
+                                }
+                            } else {
+                                return root.transactionFee + " XMR" + (maliciousTxFee ? " (HIGH FEE)" : "")
+                            }
+                        } else {
+                            return "";
+                        }
+                    }
+                }
+
+                Text {
+                    Layout.fillWidth: true
+                    Layout.leftMargin: 8
+                    color: MoneroComponents.Style.buttonSecondaryTextColor
+                    visible: persistentSettings.fiatPriceEnabled && root.transactionFee
+                    font.pixelSize: 15
+                    text: showFiatConversion(root.transactionFee)
+                }
+            }
+        }
+
+        ColumnLayout {
+            id: bottom
+            Layout.alignment: Qt.AlignBottom | Qt.AlignHCenter
+            Layout.fillWidth: true
+
+            RowLayout {
+                id: bottomMessage
+                Layout.fillWidth: true
+                Layout.preferredHeight: 50
+
+                QtQuickControls1.BusyIndicator {
+                    visible: !bottomTextAnimation.running
+                    running: !bottomTextAnimation.running
+                    scale: .5
+                }
+
+                Text {
+                    id: bottomText
+                    color: MoneroComponents.Style.defaultFontColor
+                    text: ""
+                    horizontalAlignment: Text.AlignHCenter
+                    wrapMode: Text.Wrap
+                    font.pixelSize: 17
+                    opacity: 1
+
+                    SequentialAnimation{
+                        id:bottomTextAnimation
+                        running: false
+                        loops: Animation.Infinite
+                        alwaysRunToEnd: true
+                        NumberAnimation { target: bottomText; property: "opacity"; to: 0; duration: 500}
+                        NumberAnimation { target: bottomText; property: "opacity"; to: 1; duration: 500}
+                    }
+                }
+            }
+
+            RowLayout {
+                id: buttons
+                spacing: 70
+                Layout.fillWidth: true
+                Layout.preferredHeight: 50
+
+                MoneroComponents.StandardButton {
+                    id: backButton
+                    text: qsTr("Back") + translationManager.emptyString;
+                    width: 200
+                    primary: false
+                    KeyNavigation.tab: confirmButton
+                    onClicked: {
+                        root.close()
+                        root.clearFields()
+                        root.rejected()
+                    }
+                }
+
+                MoneroComponents.StandardButton {
+                    id: confirmButton
+                    text: qsTr("Confirm") + translationManager.emptyString;
+                    rightIcon: "qrc:///images/rightArrow.png"
+                    width: 200
+                    KeyNavigation.tab: backButton
+                    onClicked: {
+                        root.close()
+                        root.accepted()
+                    }
+                }
+            }
+        }
+    }
+}

deployment.pri

@@ -1,27 +0,0 @@
-android-no-sdk {
-    target.path = /data/user/qt
-    export(target.path)
-    INSTALLS += target
-} else:android {
-    x86 {
-        target.path = /libs/x86
-    } else: armeabi-v7a {
-        target.path = /libs/armeabi-v7a
-    } else {
-        target.path = /libs/armeabi
-    }
-    export(target.path)
-    INSTALLS += target
-} else:unix {
-    isEmpty(target.path) {
-        qnx {
-            target.path = /tmp/$${TARGET}/bin
-        } else {
-            target.path = /opt/$${TARGET}/bin
-        }
-        export(target.path)
-    }
-    INSTALLS += target
-}
-
-export(INSTALLS)

external/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_library(quirc STATIC
+    quirc/lib/decode.c
+    quirc/lib/identify.c
+    quirc/lib/quirc.c
+    quirc/lib/version_db.c
+)
+set_target_properties(quirc PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_include_directories(quirc PUBLIC quirc/lib)

fonts/FontAwesome/FontAwesome.qml

@@ -3,811 +3,74 @@ import QtQuick 2.9
 
 Object {
 
+    //Font Awesome version 5.15.3
     FontLoader {
         id: regular
-        source: "./fa-regular-400.ttf"
+        source: "./fa-regular-400.otf"
     }
 
     FontLoader {
         id: brands
-        source: "./fa-brands-400.ttf"
+        source: "./fa-brands-400.otf"
     }
 
     FontLoader {
         id: solid
-        source: "./fa-solid-900.ttf"
+        source: "./fa-solid-900.otf"
     }
 
     property string fontFamily: regular.name
     property string fontFamilyBrands: brands.name
     property string fontFamilySolid: solid.name
 
-    // Icons 
+    // Icons used in Monero GUI (Font Awesome version 5.15.3)
+    // To add new icons, check unicodes in Font Awesome Free's Cheatsheet:
+    // https://fontawesome.com/v5/cheatsheet/free/solid
+    // https://fontawesome.com/v5/cheatsheet/free/regular
+    // https://fontawesome.com/v5/cheatsheet/free/brands
+
     property string addressBook : "\uf2b9"
-    property string addressBookO : "\uf2ba"
-    property string addressCard : "\uf2bb"
-    property string addressCardO : "\uf2bc"
-    property string adjust : "\uf042"
-    property string adn : "\uf170"
-    property string alignCenter : "\uf037"
-    property string alignJustify : "\uf039"
-    property string alignLeft : "\uf036"
-    property string alignRight : "\uf038"
-    property string amazon : "\uf270"
-    property string ambulance : "\uf0f9"
-    property string americanSignLanguageInterpreting : "\uf2a3"
-    property string anchor : "\uf13d"
-    property string android : "\uf17b"
-    property string angellist : "\uf209"
-    property string angleDoubleDown : "\uf103"
-    property string angleDoubleLeft : "\uf100"
-    property string angleDoubleRight : "\uf101"
-    property string angleDoubleUp : "\uf102"
-    property string angleDown : "\uf107"
-    property string angleLeft : "\uf104"
-    property string angleRight : "\uf105"
-    property string angleUp : "\uf106"
-    property string apple : "\uf179"
-    property string archive : "\uf187"
-    property string areaChart : "\uf1fe"
-    property string arrowCircleDown : "\uf0ab"
-    property string arrowCircleLeft : "\uf0a8"
-    property string arrowCircleODown : "\uf01a"
-    property string arrowCircleOLeft : "\uf190"
-    property string arrowCircleORight : "\uf18e"
-    property string arrowCircleOUp : "\uf01b"
     property string arrowCircleRight : "\uf0a9"
-    property string arrowCircleUp : "\uf0aa"
     property string arrowDown : "\uf063"
     property string arrowLeft : "\uf060"
     property string arrowRight : "\uf061"
-    property string arrowUp : "\uf062"
-    property string arrows : "\uf047"
-    property string arrowsAlt : "\uf0b2"
-    property string arrowsH : "\uf07e"
-    property string arrowsV : "\uf07d"
-    property string aslInterpreting : "\uf2a3"
-    property string assistiveListeningSystems : "\uf2a2"
-    property string asterisk : "\uf069"
-    property string at : "\uf1fa"
-    property string audioDescription : "\uf29e"
-    property string automobile : "\uf1b9"
-    property string backward : "\uf04a"
-    property string balanceScale : "\uf24e"
-    property string ban : "\uf05e"
-    property string bandcamp : "\uf2d5"
-    property string bank : "\uf19c"
-    property string barChart : "\uf080"
-    property string barChartO : "\uf080"
-    property string barcode : "\uf02a"
-    property string bars : "\uf0c9"
-    property string bath : "\uf2cd"
-    property string bathtub : "\uf2cd"
-    property string battery : "\uf240"
-    property string battery0 : "\uf244"
-    property string battery1 : "\uf243"
-    property string battery2 : "\uf242"
-    property string battery3 : "\uf241"
-    property string battery4 : "\uf240"
-    property string batteryEmpty : "\uf244"
-    property string batteryFull : "\uf240"
-    property string batteryHalf : "\uf242"
-    property string batteryQuarter : "\uf243"
-    property string batteryThreeQuarters : "\uf241"
-    property string bed : "\uf236"
-    property string beer : "\uf0fc"
-    property string behance : "\uf1b4"
-    property string behanceSquare : "\uf1b5"
-    property string bell : "\uf0f3"
-    property string bellO : "\uf0a2"
-    property string bellSlash : "\uf1f6"
-    property string bellSlashO : "\uf1f7"
-    property string bicycle : "\uf206"
-    property string binoculars : "\uf1e5"
-    property string birthdayCake : "\uf1fd"
-    property string bitbucket : "\uf171"
-    property string bitbucketSquare : "\uf172"
-    property string bitcoin : "\uf15a"
-    property string blackTie : "\uf27e"
-    property string blind : "\uf29d"
-    property string bluetooth : "\uf293"
-    property string bluetoothB : "\uf294"
-    property string bold : "\uf032"
-    property string bolt : "\uf0e7"
-    property string bomb : "\uf1e2"
-    property string book : "\uf02d"
-    property string bookmark : "\uf02e"
-    property string bookmarkO : "\uf097"
-    property string braille : "\uf2a1"
-    property string briefcase : "\uf0b1"
-    property string btc : "\uf15a"
-    property string bug : "\uf188"
-    property string building : "\uf1ad"
-    property string buildingO : "\uf0f7"
-    property string bullhorn : "\uf0a1"
-    property string bullseye : "\uf140"
-    property string bus : "\uf207"
-    property string buysellads : "\uf20d"
-    property string cab : "\uf1ba"
-    property string calculator : "\uf1ec"
-    property string calendar : "\uf073"
-    property string calendarCheckO : "\uf274"
-    property string calendarMinusO : "\uf272"
-    property string calendarO : "\uf133"
-    property string calendarPlusO : "\uf271"
-    property string calendarTimesO : "\uf273"
-    property string camera : "\uf030"
-    property string cameraRetro : "\uf083"
-    property string car : "\uf1b9"
-    property string caretDown : "\uf0d7"
-    property string caretLeft : "\uf0d9"
-    property string caretRight : "\uf0da"
-    property string caretSquareODown : "\uf150"
-    property string caretSquareOLeft : "\uf191"
-    property string caretSquareORight : "\uf152"
-    property string caretSquareOUp : "\uf151"
-    property string caretUp : "\uf0d8"
-    property string cartArrowDown : "\uf218"
-    property string cartPlus : "\uf217"
     property string cashRegister: "\uf788"
-    property string cc : "\uf20a"
-    property string ccAmex : "\uf1f3"
-    property string ccDinersClub : "\uf24c"
-    property string ccDiscover : "\uf1f2"
-    property string ccJcb : "\uf24b"
-    property string ccMastercard : "\uf1f1"
-    property string ccPaypal : "\uf1f4"
-    property string ccStripe : "\uf1f5"
-    property string ccVisa : "\uf1f0"
-    property string certificate : "\uf0a3"
-    property string chain : "\uf0c1"
-    property string chainBroken : "\uf127"
-    property string check : "\uf00c"
-    property string checkCircle : "\uf058"
-    property string checkCircleO : "\uf05d"
-    property string checkSquare : "\uf14a"
-    property string checkSquareO : "\uf046"
-    property string chevronCircleDown : "\uf13a"
-    property string chevronCircleLeft : "\uf137"
-    property string chevronCircleRight : "\uf138"
-    property string chevronCircleUp : "\uf139"
-    property string chevronDown : "\uf078"
-    property string chevronLeft : "\uf053"
-    property string chevronRight : "\uf054"
-    property string chevronUp : "\uf077"
-    property string child : "\uf1ae"
-    property string chrome : "\uf268"
-    property string circle : "\uf111"
-    property string circleO : "\uf10c"
-    property string circleONotch : "\uf1ce"
-    property string circleThin : "\uf1db"
+    property string checkCircle: "\uf058"
     property string clipboard : "\uf0ea"
     property string clockO : "\uf017"
-    property string clone : "\uf24d"
-    property string close : "\uf00d"
     property string cloud : "\uf0c2"
-    property string cloudDownload : "\uf0ed"
-    property string cloudUpload : "\uf0ee"
-    property string cny : "\uf157"
-    property string code : "\uf121"
-    property string codeFork : "\uf126"
-    property string codepen : "\uf1cb"
-    property string codiepie : "\uf284"
-    property string coffee : "\uf0f4"
-    property string cog : "\uf013"
-    property string cogs : "\uf085"
-    property string columns : "\uf0db"
-    property string comment : "\uf075"
-    property string commentO : "\uf0e5"
-    property string commenting : "\uf27a"
-    property string commentingO : "\uf27b"
-    property string comments : "\uf086"
-    property string commentsO : "\uf0e6"
-    property string compass : "\uf14e"
-    property string compress : "\uf066"
-    property string connectdevelop : "\uf20e"
-    property string contao : "\uf26d"
-    property string copy : "\uf0c5"
-    property string copyright : "\uf1f9"
-    property string creativeCommons : "\uf25e"
-    property string creditCard : "\uf09d"
-    property string creditCardAlt : "\uf283"
-    property string crop : "\uf125"
-    property string crosshairs : "\uf05b"
-    property string css3 : "\uf13c"
-    property string cube : "\uf1b2"
-    property string cubes : "\uf1b3"
-    property string cut : "\uf0c4"
-    property string cutlery : "\uf0f5"
-    property string dashboard : "\uf0e4"
-    property string dashcube : "\uf210"
-    property string database : "\uf1c0"
-    property string deaf : "\uf2a4"
-    property string deafness : "\uf2a4"
-    property string dedent : "\uf03b"
-    property string delicious : "\uf1a5"
     property string desktop : "\uf108"
-    property string deviantart : "\uf1bd"
-    property string diamond : "\uf219"
-    property string digg : "\uf1a6"
-    property string dollar : "\uf155"
-    property string dotCircleO : "\uf192"
-    property string download : "\uf019"
-    property string dribbble : "\uf17d"
-    property string driversLicense : "\uf2c2"
-    property string driversLicenseO : "\uf2c3"
-    property string dropbox : "\uf16b"
-    property string drupal : "\uf1a9"
-    property string edge : "\uf282"
     property string edit : "\uf044"
-    property string eercast : "\uf2da"
-    property string eject : "\uf052"
     property string ellipsisH : "\uf141"
-    property string ellipsisV : "\uf142"
-    property string empire : "\uf1d1"
-    property string envelope : "\uf0e0"
-    property string envelopeO : "\uf003"
-    property string envelopeOpen : "\uf2b6"
-    property string envelopeOpenO : "\uf2b7"
-    property string envelopeSquare : "\uf199"
-    property string envira : "\uf299"
-    property string eraser : "\uf12d"
-    property string etsy : "\uf2d7"
-    property string eur : "\uf153"
-    property string euro : "\uf153"
-    property string exchange : "\uf0ec"
-    property string exclamation : "\uf12a"
     property string exclamationCircle : "\uf06a"
-    property string exclamationTriangle : "\uf071"
-    property string expand : "\uf065"
-    property string expeditedssl : "\uf23e"
-    property string externalLink : "\uf08e"
-    property string externalLinkSquare : "\uf14c"
     property string eye : "\uf06e"
     property string eyeSlash : "\uf070"
-    property string eyedropper : "\uf1fb"
-    property string fa : "\uf2b4"
-    property string facebook : "\uf09a"
-    property string facebookF : "\uf09a"
-    property string facebookOfficial : "\uf230"
-    property string facebookSquare : "\uf082"
-    property string fastBackward : "\uf049"
-    property string fastForward : "\uf050"
-    property string fax : "\uf1ac"
-    property string feed : "\uf09e"
-    property string female : "\uf182"
-    property string fighterJet : "\uf0fb"
-    property string file : "\uf15b"
-    property string fileArchiveO : "\uf1c6"
-    property string fileAudioO : "\uf1c7"
-    property string fileCodeO : "\uf1c9"
-    property string fileExcelO : "\uf1c3"
-    property string fileImageO : "\uf1c5"
-    property string fileMovieO : "\uf1c8"
-    property string fileO : "\uf016"
-    property string filePdfO : "\uf1c1"
-    property string filePhotoO : "\uf1c5"
-    property string filePictureO : "\uf1c5"
-    property string filePowerpointO : "\uf1c4"
-    property string fileSoundO : "\uf1c7"
-    property string fileText : "\uf15c"
-    property string fileTextO : "\uf0f6"
-    property string fileVideoO : "\uf1c8"
-    property string fileWordO : "\uf1c2"
-    property string fileZipO : "\uf1c6"
-    property string filesO : "\uf0c5"
-    property string film : "\uf008"
-    property string filter : "\uf0b0"
-    property string fire : "\uf06d"
-    property string fireExtinguisher : "\uf134"
-    property string firefox : "\uf269"
-    property string firstOrder : "\uf2b0"
-    property string flag : "\uf024"
-    property string flagCheckered : "\uf11e"
-    property string flagO : "\uf11d"
-    property string flash : "\uf0e7"
-    property string flask : "\uf0c3"
-    property string flickr : "\uf16e"
-    property string floppyO : "\uf0c7"
-    property string folder : "\uf07b"
-    property string folderO : "\uf114"
     property string folderOpen : "\uf07c"
-    property string folderOpenO : "\uf115"
-    property string font : "\uf031"
-    property string fontAwesome : "\uf2b4"
-    property string fonticons : "\uf280"
-    property string fortAwesome : "\uf286"
-    property string forumbee : "\uf211"
-    property string forward : "\uf04e"
-    property string foursquare : "\uf180"
-    property string freeCodeCamp : "\uf2c5"
-    property string frownO : "\uf119"
-    property string futbolO : "\uf1e3"
-    property string gamepad : "\uf11b"
-    property string gavel : "\uf0e3"
-    property string gbp : "\uf154"
-    property string ge : "\uf1d1"
-    property string gear : "\uf013"
-    property string gears : "\uf085"
-    property string genderless : "\uf22d"
-    property string getPocket : "\uf265"
-    property string gg : "\uf260"
-    property string ggCircle : "\uf261"
-    property string gift : "\uf06b"
-    property string git : "\uf1d3"
-    property string gitSquare : "\uf1d2"
-    property string github : "\uf09b"
-    property string githubAlt : "\uf113"
-    property string githubSquare : "\uf092"
-    property string gitlab : "\uf296"
-    property string gittip : "\uf184"
-    property string glass : "\uf000"
-    property string glide : "\uf2a5"
-    property string glideG : "\uf2a6"
     property string globe : "\uf0ac"
-    property string google : "\uf1a0"
-    property string googlePlus : "\uf0d5"
-    property string googlePlusCircle : "\uf2b3"
-    property string googlePlusOfficial : "\uf2b3"
-    property string googlePlusSquare : "\uf0d4"
-    property string googleWallet : "\uf1ee"
-    property string graduationCap : "\uf19d"
-    property string gratipay : "\uf184"
-    property string grav : "\uf2d6"
-    property string group : "\uf0c0"
-    property string hSquare : "\uf0fd"
-    property string hackerNews : "\uf1d4"
-    property string handGrabO : "\uf255"
-    property string handLizardO : "\uf258"
-    property string handODown : "\uf0a7"
-    property string handOLeft : "\uf0a5"
-    property string handORight : "\uf0a4"
-    property string handOUp : "\uf0a6"
-    property string handPaperO : "\uf256"
-    property string handPeaceO : "\uf25b"
-    property string handPointerO : "\uf25a"
-    property string handRockO : "\uf255"
-    property string handScissorsO : "\uf257"
-    property string handSpockO : "\uf259"
-    property string handStopO : "\uf256"
-    property string handshakeO : "\uf2b5"
-    property string hardOfHearing : "\uf2a4"
-    property string hashtag : "\uf292"
-    property string hddO : "\uf0a0"
-    property string header : "\uf1dc"
-    property string headphones : "\uf025"
-    property string heart : "\uf004"
-    property string heartO : "\uf08a"
-    property string heartbeat : "\uf21e"
-    property string history : "\uf1da"
     property string home : "\uf015"
-    property string hospitalO : "\uf0f8"
-    property string hotel : "\uf236"
-    property string hourglass : "\uf254"
-    property string hourglass1 : "\uf251"
-    property string hourglass2 : "\uf252"
-    property string hourglass3 : "\uf253"
-    property string hourglassEnd : "\uf253"
-    property string hourglassHalf : "\uf252"
-    property string hourglassO : "\uf250"
-    property string hourglassStart : "\uf251"
-    property string houzz : "\uf27c"
-    property string html5 : "\uf13b"
-    property string iCursor : "\uf246"
-    property string idBadge : "\uf2c1"
-    property string idCard : "\uf2c2"
-    property string idCardO : "\uf2c3"
-    property string ils : "\uf20b"
-    property string image : "\uf03e"
-    property string imdb : "\uf2d8"
-    property string inbox : "\uf01c"
-    property string indent : "\uf03c"
-    property string industry : "\uf275"
+    property string houseUser : "\ue065"
+    property string infinity : "\uf534"
     property string info : "\uf129"
-    property string infoCircle : "\uf05a"
-    property string inr : "\uf156"
-    property string instagram : "\uf16d"
-    property string institution : "\uf19c"
-    property string internetExplorer : "\uf26b"
-    property string intersex : "\uf224"
-    property string ioxhost : "\uf208"
-    property string italic : "\uf033"
-    property string joomla : "\uf1aa"
-    property string jpy : "\uf157"
-    property string jsfiddle : "\uf1cc"
     property string key : "\uf084"
-    property string keyboardO : "\uf11c"
-    property string krw : "\uf159"
     property string language : "\uf1ab"
-    property string laptop : "\uf109"
-    property string lastfm : "\uf202"
-    property string lastfmSquare : "\uf203"
-    property string leaf : "\uf06c"
-    property string leanpub : "\uf212"
-    property string legal : "\uf0e3"
-    property string lemonO : "\uf094"
-    property string levelDown : "\uf149"
-    property string levelUp : "\uf148"
-    property string lifeBouy : "\uf1cd"
-    property string lifeBuoy : "\uf1cd"
-    property string lifeRing : "\uf1cd"
-    property string lifeSaver : "\uf1cd"
-    property string lightbulbO : "\uf0eb"
-    property string lineChart : "\uf201"
-    property string link : "\uf0c1"
-    property string linkedin : "\uf0e1"
-    property string linkedinSquare : "\uf08c"
-    property string linode : "\uf2b8"
-    property string linux : "\uf17c"
-    property string list : "\uf03a"
-    property string listAlt : "\uf022"
-    property string listOl : "\uf0cb"
-    property string listUl : "\uf0ca"
-    property string locationArrow : "\uf124"
     property string lock : "\uf023"
-    property string longArrowDown : "\uf175"
-    property string longArrowLeft : "\uf177"
-    property string longArrowRight : "\uf178"
-    property string longArrowUp : "\uf176"
-    property string lowVision : "\uf2a8"
-    property string magic : "\uf0d0"
-    property string magnet : "\uf076"
-    property string mailForward : "\uf064"
-    property string mailReply : "\uf112"
-    property string mailReplyAll : "\uf122"
-    property string male : "\uf183"
-    property string map : "\uf279"
-    property string mapMarker : "\uf041"
-    property string mapO : "\uf278"
-    property string mapPin : "\uf276"
-    property string mapSigns : "\uf277"
-    property string mars : "\uf222"
-    property string marsDouble : "\uf227"
-    property string marsStroke : "\uf229"
-    property string marsStrokeH : "\uf22b"
-    property string marsStrokeV : "\uf22a"
-    property string maxcdn : "\uf136"
-    property string meanpath : "\uf20c"
-    property string medium : "\uf23a"
-    property string medkit : "\uf0fa"
-    property string meetup : "\uf2e0"
-    property string mehO : "\uf11a"
-    property string mercury : "\uf223"
-    property string microchip : "\uf2db"
-    property string microphone : "\uf130"
-    property string microphoneSlash : "\uf131"
+    property string magnifyingGlass : "\uf002"
     property string minus : "\uf068"
     property string minusCircle : "\uf056"
-    property string minusSquare : "\uf146"
-    property string minusSquareO : "\uf147"
-    property string mixcloud : "\uf289"
-    property string mobile : "\uf10b"
-    property string mobilePhone : "\uf10b"
-    property string modx : "\uf285"
-    property string money : "\uf0d6"
     property string moonO : "\uf186"
-    property string mortarBoard : "\uf19d"
-    property string motorcycle : "\uf21c"
-    property string mousePointer : "\uf245"
-    property string music : "\uf001"
-    property string navicon : "\uf0c9"
-    property string neuter : "\uf22c"
-    property string newspaperO : "\uf1ea"
-    property string objectGroup : "\uf247"
-    property string objectUngroup : "\uf248"
-    property string odnoklassniki : "\uf263"
-    property string odnoklassnikiSquare : "\uf264"
-    property string opencart : "\uf23d"
-    property string openid : "\uf19b"
-    property string opera : "\uf26a"
-    property string optinMonster : "\uf23c"
-    property string outdent : "\uf03b"
-    property string pagelines : "\uf18c"
-    property string paintBrush : "\uf1fc"
-    property string paperPlane : "\uf1d8"
-    property string paperPlaneO : "\uf1d9"
-    property string paperclip : "\uf0c6"
-    property string paragraph : "\uf1dd"
+    property string monero : "\uf3d0"
     property string paste : "\uf0ea"
-    property string pause : "\uf04c"
-    property string pauseCircle : "\uf28b"
-    property string pauseCircleO : "\uf28c"
-    property string paw : "\uf1b0"
-    property string paypal : "\uf1ed"
-    property string pencil : "\uf040"
     property string pencilSquare : "\uf14b"
-    property string pencilSquareO : "\uf044"
-    property string percent : "\uf295"
-    property string phone : "\uf095"
-    property string phoneSquare : "\uf098"
-    property string photo : "\uf03e"
-    property string pictureO : "\uf03e"
-    property string pieChart : "\uf200"
-    property string piedPiper : "\uf2ae"
-    property string piedPiperAlt : "\uf1a8"
-    property string piedPiperPp : "\uf1a7"
-    property string pinterest : "\uf0d2"
-    property string pinterestP : "\uf231"
-    property string pinterestSquare : "\uf0d3"
-    property string plane : "\uf072"
-    property string play : "\uf04b"
-    property string playCircle : "\uf144"
-    property string playCircleO : "\uf01d"
-    property string plug : "\uf1e6"
     property string plus : "\uf067"
     property string plusCircle : "\uf055"
-    property string plusSquare : "\uf0fe"
-    property string plusSquareO : "\uf196"
-    property string podcast : "\uf2ce"
-    property string powerOff : "\uf011"
-    property string printIcon : "\uf02f"
     property string productHunt : "\uf288"
-    property string puzzlePiece : "\uf12e"
-    property string qq : "\uf1d6"
     property string qrcode : "\uf029"
-    property string question : "\uf128"
     property string questionCircle : "\uf059"
-    property string questionCircleO : "\uf29c"
-    property string quora : "\uf2c4"
-    property string quoteLeft : "\uf10d"
-    property string quoteRight : "\uf10e"
-    property string ra : "\uf1d0"
     property string random : "\uf074"
-    property string ravelry : "\uf2d9"
-    property string rebel : "\uf1d0"
-    property string recycle : "\uf1b8"
-    property string reddit : "\uf1a1"
-    property string redditAlien : "\uf281"
-    property string redditSquare : "\uf1a2"
-    property string refresh : "\uf021"
-    property string registered : "\uf25d"
-    property string remove : "\uf00d"
-    property string renren : "\uf18b"
-    property string reorder : "\uf0c9"
     property string repeat : "\uf01e"
-    property string reply : "\uf112"
-    property string replyAll : "\uf122"
-    property string resistance : "\uf1d0"
-    property string retweet : "\uf079"
-    property string rmb : "\uf157"
-    property string road : "\uf018"
-    property string rocket : "\uf135"
-    property string rotateLeft : "\uf0e2"
-    property string rotateRight : "\uf01e"
-    property string rouble : "\uf158"
-    property string rss : "\uf09e"
-    property string rssSquare : "\uf143"
-    property string rub : "\uf158"
-    property string ruble : "\uf158"
-    property string rupee : "\uf156"
-    property string s15 : "\uf2cd"
-    property string safari : "\uf267"
-    property string save : "\uf0c7"
-    property string scissors : "\uf0c4"
-    property string scribd : "\uf28a"
-    property string search : "\uf002"
-    property string searchMinus : "\uf010"
     property string searchPlus : "\uf00e"
-    property string sellsy : "\uf213"
-    property string send : "\uf1d8"
-    property string sendO : "\uf1d9"
     property string server : "\uf233"
-    property string share : "\uf064"
-    property string shareAlt : "\uf1e0"
-    property string shareAltSquare : "\uf1e1"
-    property string shareSquare : "\uf14d"
-    property string shareSquareO : "\uf045"
-    property string shekel : "\uf20b"
-    property string sheqel : "\uf20b"
-    property string shield : "\uf132"
-    property string ship : "\uf21a"
-    property string shirtsinbulk : "\uf214"
-    property string shoppingBag : "\uf290"
-    property string shoppingBasket : "\uf291"
-    property string shoppingCart : "\uf07a"
-    property string shower : "\uf2cc"
-    property string signIn : "\uf090"
-    property string signLanguage : "\uf2a7"
+    property string shieldAlt : "\uf3ed"
     property string signOutAlt : "\uf2f5"
-    property string signOut : "\uf08b"
-    property string signal : "\uf012"
-    property string signing : "\uf2a7"
-    property string simplybuilt : "\uf215"
-    property string sitemap : "\uf0e8"
-    property string skyatlas : "\uf216"
-    property string skype : "\uf17e"
-    property string slack : "\uf198"
-    property string sliders : "\uf1de"
-    property string slideshare : "\uf1e7"
-    property string smileO : "\uf118"
-    property string snapchat : "\uf2ab"
-    property string snapchatGhost : "\uf2ac"
-    property string snapchatSquare : "\uf2ad"
-    property string snowflakeO : "\uf2dc"
-    property string soccerBallO : "\uf1e3"
-    property string sort : "\uf0dc"
-    property string sortAlphaAsc : "\uf15d"
-    property string sortAlphaDesc : "\uf15e"
-    property string sortAmountAsc : "\uf160"
-    property string sortAmountDesc : "\uf161"
-    property string sortAsc : "\uf0de"
-    property string sortDesc : "\uf0dd"
-    property string sortDown : "\uf0dd"
-    property string sortNumericAsc : "\uf162"
-    property string sortNumericDesc : "\uf163"
-    property string sortUp : "\uf0de"
-    property string soundcloud : "\uf1be"
-    property string spaceShuttle : "\uf197"
-    property string spinner : "\uf110"
-    property string spoon : "\uf1b1"
-    property string spotify : "\uf1bc"
-    property string square : "\uf0c8"
-    property string squareO : "\uf096"
-    property string stackExchange : "\uf18d"
-    property string stackOverflow : "\uf16c"
-    property string star : "\uf005"
-    property string starHalf : "\uf089"
-    property string starHalfEmpty : "\uf123"
-    property string starHalfFull : "\uf123"
-    property string starHalfO : "\uf123"
-    property string starO : "\uf006"
-    property string steam : "\uf1b6"
-    property string steamSquare : "\uf1b7"
-    property string stepBackward : "\uf048"
-    property string stepForward : "\uf051"
-    property string stethoscope : "\uf0f1"
-    property string stickyNote : "\uf249"
-    property string stickyNoteO : "\uf24a"
-    property string stop : "\uf04d"
-    property string stopCircle : "\uf28d"
-    property string stopCircleO : "\uf28e"
-    property string streetView : "\uf21d"
-    property string strikethrough : "\uf0cc"
-    property string stumbleupon : "\uf1a4"
-    property string stumbleuponCircle : "\uf1a3"
-    property string subscript : "\uf12c"
-    property string subway : "\uf239"
-    property string suitcase : "\uf0f2"
-    property string sunO : "\uf185"
-    property string superpowers : "\uf2dd"
-    property string superscript : "\uf12b"
-    property string support : "\uf1cd"
-    property string table : "\uf0ce"
-    property string tablet : "\uf10a"
-    property string tachometer : "\uf0e4"
-    property string tag : "\uf02b"
-    property string tags : "\uf02c"
-    property string tasks : "\uf0ae"
-    property string taxi : "\uf1ba"
-    property string telegram : "\uf2c6"
-    property string television : "\uf26c"
-    property string tencentWeibo : "\uf1d5"
-    property string terminal : "\uf120"
-    property string textHeight : "\uf034"
-    property string textWidth : "\uf035"
-    property string th : "\uf00a"
-    property string thLarge : "\uf009"
-    property string thList : "\uf00b"
-    property string themeisle : "\uf2b2"
-    property string thermometer : "\uf2c7"
-    property string thermometer0 : "\uf2cb"
-    property string thermometer1 : "\uf2ca"
-    property string thermometer2 : "\uf2c9"
-    property string thermometer3 : "\uf2c8"
-    property string thermometer4 : "\uf2c7"
-    property string thermometerEmpty : "\uf2cb"
-    property string thermometerFull : "\uf2c7"
-    property string thermometerHalf : "\uf2c9"
-    property string thermometerQuarter : "\uf2ca"
-    property string thermometerThreeQuarters : "\uf2c8"
-    property string thumbTack : "\uf08d"
-    property string thumbsDown : "\uf165"
-    property string thumbsODown : "\uf088"
-    property string thumbsOUp : "\uf087"
-    property string thumbsUp : "\uf164"
-    property string ticket : "\uf145"
     property string times : "\uf00d"
-    property string timesCircle : "\uf057"
-    property string timesCircleO : "\uf05c"
-    property string timesRectangle : "\uf2d3"
-    property string timesRectangleO : "\uf2d4"
-    property string tint : "\uf043"
-    property string toggleDown : "\uf150"
-    property string toggleLeft : "\uf191"
-    property string toggleOff : "\uf204"
-    property string toggleOn : "\uf205"
-    property string toggleRight : "\uf152"
-    property string toggleUp : "\uf151"
-    property string trademark : "\uf25c"
-    property string train : "\uf238"
-    property string transgender : "\uf224"
-    property string transgenderAlt : "\uf225"
-    property string trash : "\uf1f8"
-    property string trashO : "\uf014"
-    property string tree : "\uf1bb"
-    property string trello : "\uf181"
-    property string tripadvisor : "\uf262"
-    property string trophy : "\uf091"
-    property string truck : "\uf0d1"
-    property string tryIcon : "\uf195"
-    property string tty : "\uf1e4"
-    property string tumblr : "\uf173"
-    property string tumblrSquare : "\uf174"
-    property string turkishLira : "\uf195"
-    property string tv : "\uf26c"
-    property string twitch : "\uf1e8"
-    property string twitter : "\uf099"
-    property string twitterSquare : "\uf081"
-    property string umbrella : "\uf0e9"
-    property string underline : "\uf0cd"
-    property string undo : "\uf0e2"
-    property string universalAccess : "\uf29a"
-    property string university : "\uf19c"
-    property string unlink : "\uf127"
-    property string unlock : "\uf09c"
-    property string unlockAlt : "\uf13e"
-    property string unsorted : "\uf0dc"
-    property string upload : "\uf093"
-    property string usb : "\uf287"
-    property string usd : "\uf155"
-    property string user : "\uf007"
-    property string userCircle : "\uf2bd"
-    property string userCircleO : "\uf2be"
-    property string userMd : "\uf0f0"
-    property string userO : "\uf2c0"
-    property string userPlus : "\uf234"
-    property string userSecret : "\uf21b"
-    property string userTimes : "\uf235"
-    property string users : "\uf0c0"
-    property string vcard : "\uf2bb"
-    property string vcardO : "\uf2bc"
-    property string venus : "\uf221"
-    property string venusDouble : "\uf226"
-    property string venusMars : "\uf228"
-    property string viacoin : "\uf237"
-    property string viadeo : "\uf2a9"
-    property string viadeoSquare : "\uf2aa"
-    property string videoCamera : "\uf03d"
-    property string vimeo : "\uf27d"
-    property string vimeoSquare : "\uf194"
-    property string vine : "\uf1ca"
-    property string vk : "\uf189"
-    property string volumeControlPhone : "\uf2a0"
-    property string volumeDown : "\uf027"
-    property string volumeOff : "\uf026"
-    property string volumeUp : "\uf028"
-    property string warning : "\uf071"
-    property string wechat : "\uf1d7"
-    property string weibo : "\uf18a"
-    property string weixin : "\uf1d7"
-    property string whatsapp : "\uf232"
-    property string wheelchair : "\uf193"
-    property string wheelchairAlt : "\uf29b"
-    property string wifi : "\uf1eb"
-    property string wikipediaW : "\uf266"
-    property string windowClose : "\uf2d3"
-    property string windowCloseO : "\uf2d4"
-    property string windowMaximize : "\uf2d0"
-    property string windowMinimize : "\uf2d1"
-    property string windowRestore : "\uf2d2"
-    property string windows : "\uf17a"
-    property string won : "\uf159"
-    property string wordpress : "\uf19a"
-    property string wpbeginner : "\uf297"
-    property string wpexplorer : "\uf2de"
-    property string wpforms : "\uf298"
-    property string wrench : "\uf0ad"
-    property string xing : "\uf168"
-    property string xingSquare : "\uf169"
-    property string yCombinator : "\uf23b"
-    property string yCombinatorSquare : "\uf1d4"
-    property string yahoo : "\uf19e"
-    property string yc : "\uf23b"
-    property string ycSquare : "\uf1d4"
-    property string yelp : "\uf1e9"
-    property string yen : "\uf157"
-    property string yoast : "\uf2b1"
-    property string youtube : "\uf167"
-    property string youtubePlay : "\uf16a"
-    property string youtubeSquare : "\uf166"
 }

get_libwallet_api.sh

@@ -1,286 +0,0 @@
-#!/bin/bash
-MONERO_URL=https://github.com/monero-project/monero.git
-MONERO_BRANCH=master
-
-pushd $(pwd)
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source $ROOT_DIR/utils.sh
-
-INSTALL_DIR=$ROOT_DIR/wallet
-MONERO_DIR=$ROOT_DIR/monero
-BUILD_LIBWALLET=false
-
-# init and update monero submodule
-if [ ! -d $MONERO_DIR/src ]; then
-    git submodule init monero
-fi
-git submodule update --remote
-git -C $MONERO_DIR fetch
-git -C $MONERO_DIR checkout v0.17.0.1
-
-# get monero core tag
-pushd $MONERO_DIR
-get_tag
-popd
-# create local monero branch
-git -C $MONERO_DIR checkout -B $VERSIONTAG
-
-# Merge monero PR dependencies
-
-# Workaround for git username requirements
-# Save current user settings and revert back when we are done with merging PR's
-OLD_GIT_USER=$(git -C $MONERO_DIR config --local user.name)
-OLD_GIT_EMAIL=$(git -C $MONERO_DIR config --local user.email)
-git -C $MONERO_DIR config user.name "Monero GUI"
-git -C $MONERO_DIR config user.email "gui@monero.local"
-# check for PR requirements in most recent commit message (i.e requires #xxxx)
-for PR in $(git log --format=%B -n 1 | grep -io "requires #[0-9]*" | sed 's/[^0-9]*//g'); do
-    echo "Merging monero push request #$PR"
-    # fetch pull request and merge
-    git -C $MONERO_DIR fetch origin pull/$PR/head:PR-$PR
-    git -C $MONERO_DIR merge --quiet PR-$PR  -m "Merge monero PR #$PR"
-    BUILD_LIBWALLET=true
-done
-
-# revert back to old git config
-$(git -C $MONERO_DIR config user.name "$OLD_GIT_USER")
-$(git -C $MONERO_DIR config user.email "$OLD_GIT_EMAIL")
-
-git -C $MONERO_DIR submodule init
-git -C $MONERO_DIR submodule update
-
-# Build libwallet if it doesnt exist
-if [ ! -f $MONERO_DIR/lib/libwallet_merged.a ]; then 
-    echo "libwallet_merged.a not found - Building libwallet"
-    BUILD_LIBWALLET=true
-# Build libwallet if no previous version file exists
-elif [ ! -f $MONERO_DIR/version.sh ]; then 
-    echo "monero/version.h not found - Building libwallet"
-    BUILD_LIBWALLET=true
-## Compare previously built version with submodule + merged PR's version. 
-else
-    source $MONERO_DIR/version.sh
-    # compare submodule version with latest build
-    pushd "$MONERO_DIR"
-    get_tag
-    popd
-    echo "latest libwallet version: $GUI_MONERO_VERSION"
-    echo "Installed libwallet version: $VERSIONTAG"
-    # check if recent
-    if [ "$VERSIONTAG" != "$GUI_MONERO_VERSION" ]; then
-        echo "Building new libwallet version $GUI_MONERO_VERSION"
-        BUILD_LIBWALLET=true
-    else
-        echo "latest libwallet ($GUI_MONERO_VERSION) is already built. Remove monero/lib/libwallet_merged.a to force rebuild"
-    fi
-fi
-
-if [ "$BUILD_LIBWALLET" != true ]; then
-    exit 0
-fi
-
-echo "GUI_MONERO_VERSION=\"$VERSIONTAG\"" > $MONERO_DIR/version.sh
-
-## Continue building libwallet
-
-# default build type
-BUILD_TYPE=$1
-if [ -z $BUILD_TYPE ]; then
-    BUILD_TYPE=release
-fi
-
-BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=ON"
-if [ "$BUILD_TREZOR" == false ]; then
-    BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=OFF"
-fi
-BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR_UDP_RELEASE=ON ${BUILD_TREZOR_FLAGS}"
-
-STATIC=false
-ANDROID=false
-if [ "$BUILD_TYPE" == "release" ]; then
-    echo "Building libwallet release"
-    CMAKE_BUILD_TYPE=Release
-elif [ "$BUILD_TYPE" == "release-static" ]; then
-    echo "Building libwallet release-static"
-    CMAKE_BUILD_TYPE=Release
-    STATIC=true
-elif [ "$BUILD_TYPE" == "release-android" ]; then
-    echo "Building libwallet release-static for ANDROID"
-    CMAKE_BUILD_TYPE=Release
-    STATIC=true
-    ANDROID=true
-elif [ "$BUILD_TYPE" == "debug-android" ]; then
-    echo "Building libwallet debug-static for ANDROID"
-    CMAKE_BUILD_TYPE=Debug
-    STATIC=true
-    ANDROID=true
-elif [ "$BUILD_TYPE" == "debug" ]; then
-    echo "Building libwallet debug"
-    CMAKE_BUILD_TYPE=Debug
-    STATIC=true
-else
-    echo "Valid build types are release, release-static, release-android, debug-android and debug"
-    exit 1;
-fi
-
-
-echo "cleaning up existing monero build dir, libs and includes"
-rm -fr $MONERO_DIR/build
-rm -fr $MONERO_DIR/lib
-rm -fr $MONERO_DIR/include
-rm -fr $MONERO_DIR/bin
-
-
-mkdir -p $MONERO_DIR/build/$BUILD_TYPE
-pushd $MONERO_DIR/build/$BUILD_TYPE
-
-# reusing function from "utils.sh"
-platform=$(get_platform)
-# default make executable
-make_exec="make"
-
-if [ -z "$ARCH" ]; then
-    ARCH="native"
-    if [ "$platform" == "darwin" ]; then
-        if [ "$STATIC" == true ]; then
-            ARCH="x86-64"
-        fi
-    elif [ "$platform" == "linux64" ]; then
-        if [ "$ANDROID" == true ]; then
-            ARCH="armv7-a"
-        elif [ "$STATIC" == true ]; then
-            ARCH="x86-64"
-        fi
-    elif [ "$platform" == "linux32" ]; then
-        if [ "$STATIC" == true ]; then
-            ARCH="i686"
-        fi
-    elif [ "$platform" == "linuxarmv7" ]; then
-        ARCH="armv7-a"
-    elif [ "$platform" == "mingw32" ]; then
-        ARCH="i686"
-    elif [ "$platform" == "mingw64" ]; then
-        ARCH="x86-64"
-    fi
-fi
-
-echo "Building for ARCH=$ARCH"
-
-## OS X
-if [ "$platform" == "darwin" ]; then
-    echo "Configuring build for MacOS.."
-    if [ "$STATIC" == true ]; then
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_64=ON -D BUILD_TAG="mac-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
-    else
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_TAG="mac-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-
-## LINUX 64
-elif [ "$platform" == "linux64" ]; then
-    echo "Configuring build for Linux x64"
-    if [ "$ANDROID" == true ]; then
-        echo "Configuring build for Android on Linux host"
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D ANDROID=true -D BUILD_GUI_DEPS=ON -D USE_LTO=OFF -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    elif [ "$STATIC" == true ]; then
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_64=ON -D BUILD_TAG="linux-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    else
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_TAG="linux-x64" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-
-## LINUX 32
-elif [ "$platform" == "linux32" ]; then
-    echo "Configuring build for Linux i686"
-    if [ "$STATIC" == true ]; then
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    else
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-
-## LINUX ARMv7
-elif [ "$platform" == "linuxarmv7" ]; then
-    echo "Configuring build for Linux armv7"
-    if [ "$STATIC" == true ]; then
-        cmake -D BUILD_TESTS=OFF -D ARCH="$ARCH" -D STATIC=ON -D BUILD_64=OFF  -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    else
-        cmake -D BUILD_TESTS=OFF -D ARCH="$ARCH" -D BUILD_64=OFF  -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-
-## LINUX other 
-elif [ "$platform" == "linux" ]; then
-    echo "Configuring build for Linux general"
-    if [ "$STATIC" == true ]; then
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    else
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-
-## Windows 64
-## Windows is always static to work outside msys2
-elif [ "$platform" == "mingw64" ]; then
-    # Do something under Windows NT platform
-    echo "Configuring build for MINGW64.."
-    BOOST_ROOT=/mingw64/boost
-    cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D BOOST_ROOT="$BOOST_ROOT" -D ARCH="$ARCH" -D BUILD_TAG="win-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" -D CMAKE_TOOLCHAIN_FILE=../../cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(cd $MINGW_PREFIX/.. && pwd -W) ../..
-
-## Windows 32
-elif [ "$platform" == "mingw32" ]; then
-    # Do something under Windows NT platform
-    echo "Configuring build for MINGW32.."
-    BOOST_ROOT=/mingw32/boost
-    cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D Boost_DEBUG=ON -D BOOST_ROOT="$BOOST_ROOT" -D ARCH="$ARCH" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" -D CMAKE_TOOLCHAIN_FILE=../../cmake/32-bit-toolchain.cmake -D MSYS2_FOLDER=$(cd $MINGW_PREFIX/.. && pwd -W) ../..
-    make_exec="mingw32-make"
-else
-    echo "Unknown platform, configuring general build"
-    if [ "$STATIC" == true ]; then
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    else
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-fi
-
-# set CPU core count
-# thanks to SO: http://stackoverflow.com/a/20283965/4118915
-if test -z "$CPU_CORE_COUNT"; then
-  CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)
-fi
-
-# Build libwallet_merged
-pushd $MONERO_DIR/build/$BUILD_TYPE/src/wallet
-eval $make_exec version -C ../..
-eval $make_exec  -j$CPU_CORE_COUNT
-eval $make_exec  install -j$CPU_CORE_COUNT
-popd
-
-# Build monerod
-# win32 need to build daemon manually with msys2 toolchain
-if [ "$platform" != "mingw32" ] && [ "$ANDROID" != true ]; then
-    pushd $MONERO_DIR/build/$BUILD_TYPE/src/daemon
-    eval make  -j$CPU_CORE_COUNT
-    eval make install -j$CPU_CORE_COUNT
-    popd
-fi
-
-# build install epee
-eval make -C $MONERO_DIR/build/$BUILD_TYPE/contrib/epee all install
-
-# install easylogging
-eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/easylogging++ all install
-
-# install lmdb
-eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/db_drivers/liblmdb all install
-
-# Install libunbound
-if [ -d $MONERO_DIR/build/$BUILD_TYPE/external/unbound ]; then
-    echo "Installing libunbound..."
-    pushd $MONERO_DIR/build/$BUILD_TYPE/external/unbound
-    # no need to make, it was already built as dependency for libwallet
-    # make -j$CPU_CORE_COUNT
-    $make_exec install -j$CPU_CORE_COUNT
-    popd
-fi
-
-# install randomx
-eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/randomx all install
-
-popd