Merge pull request #3391

142c6bc cmake: prepare v0.17.2.1 (selsta)

.github/workflows/build.yml

@@ -1,45 +1,23 @@
-name: continuous-integration/gh-actions/gui
+name: ci/gh-actions/gui
 
 on: [push, pull_request]
 
 jobs:
   build-macos:
-
     runs-on: macOS-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        toolchain:
-          - name: "qmake"
-            cmd: "export PATH=$PATH:/usr/local/opt/qt/bin && ./build.sh"
-          - name: "cmake"
-            cmd: "USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release -j3"
-    name: build-macos-${{ matrix.toolchain.name }}
-
     steps:
     - uses: actions/checkout@v1
       with:
         submodules: recursive
-    - name: update brew and install dependencies
-      run: brew update && brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf qt5 pkg-config
+    - name: install dependencies
+      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi zmq libpgm libsodium miniupnpc ldns expat libunwind-headers protobuf qt5 pkg-config
     - name: build
-      run: ${{ matrix.toolchain.cmd }}
+      run: DEV_MODE=ON make release -j3
     - name: test qml
       run: build/release/bin/monero-wallet-gui.app/Contents/MacOS/monero-wallet-gui --test-qml
 
   build-ubuntu:
-
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        toolchain:
-          - name: "qmake"
-            cmd: "./build.sh"
-          - name: "cmake"
-            cmd: "USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release -j3"
-    name: build-ubuntu-${{ matrix.toolchain.name }}
-
     steps:
     - uses: actions/checkout@v1
       with:
@@ -56,39 +34,144 @@ 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-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev libgcrypt20-dev xvfb
     - name: build
-      run: ${{ matrix.toolchain.cmd }}
+      run: DEV_MODE=ON make release -j3
     - name: test qml
       run: xvfb-run -a build/release/bin/monero-wallet-gui --test-qml
 
   build-windows:
-
     runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        toolchain:
-          - name: "qmake"
-            cmd: "./build.sh release"
-          - name: "cmake"
-            cmd: "USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release-win64 -j2"
-    name: build-windows-${{ matrix.toolchain.name }}
     defaults:
       run:
         shell: msys2 {0}
-
     steps:
     - 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
     - name: build
-      run: |
-        sed -i 's/CONFIG\ +=\ qtquickcompiler//' monero-wallet-gui.pro
-        ${{ matrix.toolchain.cmd }}
+      run: DEV_MODE=ON make release-win64 -j2
     - 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 zmq libpgm miniupnpc ldns expat libunwind-headers protobuf pkg-config python3 p7zip
+    - name: install dependencies
+      run: pip3 install requests semantic_version lxml py7zr
+    - name: download qt
+      run: |
+          curl -O https://raw.githubusercontent.com/engnr/qt-downloader/master/qt-downloader
+          chmod +x qt-downloader
+          ./qt-downloader macos desktop 5.15.2 clang_64
+      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.10
+      continue-on-error: true
+      with:
+        key: docker-linux-static-{hash}
+        restore-keys: |
+          docker-linux-static-
+    - name: install dependencies
+      run: sudo apt -y install xvfb libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0
+    - name: preprare build enviroment
+      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
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: recursive
+    - uses: satackey/action-docker-layer-caching@v0.0.10
+      continue-on-error: true
+      with:
+        key: docker-windows-static-{hash}
+        restore-keys: |
+          docker-windows-static-
+    - name: preprare build enviroment
+      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
+    - name: preprare build enviroment
+      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
+    - 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,17 +1,17 @@
-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 "16")
-set(VERSION_MINOR "0")
-set(VERSION_REVISION "3")
+set(VERSION_MAJOR "17")
+set(VERSION_MINOR "2")
+set(VERSION_REVISION "1")
 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 "Disable zxcvbn" OFF)
+option(ENABLE_PASS_STRENGTH_METER "Enable zxcvbn library for password strength" OFF)
 option(WITH_SCANNER "Enable webcam QR scanner" OFF)
 option(DEV_MODE "Checkout latest monero master on build" OFF)
 
@@ -21,67 +21,53 @@ include(CheckCXXCompilerFlag)
 include(CheckLinkerFlag)
 include(FindCcache)
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 if(DEBUG)
 	set(CMAKE_VERBOSE_MAKEFILE ON)
 endif()
 
 set(BUILD_GUI_DEPS ON)
-set(ARCH "x86-64")
-set(BUILD_64 ON)
+set(ARCH "x86-64" CACHE STRING "Target architecture")
+set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries")
 
-function (add_c_flag_if_supported flag var)
-  string(REPLACE "-" "_" supported ${flag}_c)
-  check_c_compiler_flag(${flag} ${supported})
-  if(${${supported}})
-    set(${var} "${${var}} ${flag}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-function (add_cxx_flag_if_supported flag var)
-  string(REPLACE "-" "_" supported ${flag}_cxx)
-  check_cxx_compiler_flag(${flag} ${supported})
-  if(${${supported}})
-    set(${var} "${${var}} ${flag}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-function (add_linker_flag_if_supported flag var)
-  string(REPLACE "-" "_" supported ${flag}_ld)
-  string(REPLACE "," "_" supported ${flag}_ld)
-  check_linker_flag(${flag} ${supported})
-  if(${${supported}})
-    set(${var} "${${var}} ${flag}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-find_package(Git)
-if(GIT_FOUND)
-  if(NOT DEV_MODE)
-    find_package(Git)
-    function (check_submodule relative_path)
-      execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${relative_path} OUTPUT_VARIABLE localHead)
-      execute_process(COMMAND git rev-parse "HEAD:${relative_path}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE checkedHead)
-      string(COMPARE EQUAL "${localHead}" "${checkedHead}" upToDate)
-      if (upToDate)
-        message(STATUS "Submodule '${relative_path}' is up-to-date")
-      else()
-        message(FATAL_ERROR "Submodule '${relative_path}' is not using the checked head. Please update all submodules with\ngit submodule update --init --force\nor run cmake with -DMANUAL_SUBMODULES=1,\n or if you want to build from latest master run cmake with -DEV_MODE,\n or run make devmode")
+if(NOT MANUAL_SUBMODULES)
+  find_package(Git)
+  if(GIT_FOUND)
+    if(NOT DEV_MODE)
+      function (check_submodule relative_path)
+        execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${relative_path} OUTPUT_VARIABLE localHead)
+        execute_process(COMMAND git rev-parse "HEAD:${relative_path}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE checkedHead)
+        string(COMPARE EQUAL "${localHead}" "${checkedHead}" upToDate)
+        if (upToDate)
+          message(STATUS "Submodule '${relative_path}' is up-to-date")
+        else()
+          message(FATAL_ERROR "Submodule '${relative_path}' is not using the checked head. Please update all submodules with\ngit submodule update --init --force --recursive\nor run cmake with -DMANUAL_SUBMODULES=1,\n or if you want to build from latest master run cmake with -DDEV_MODE=ON,\n or run make devmode")
+        endif()
+      endfunction ()
+      message(STATUS "Checking submodules")
+      check_submodule(monero)
+    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_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()
-    endfunction ()
-    message(STATUS "Checking submodules")
-    check_submodule(monero)
-  else()
-    execute_process(COMMAND cd monero && git checkout origin/master)
+    endif()
   endif()
 endif()
 
 add_subdirectory(monero)
+
+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)
@@ -91,18 +77,17 @@ 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 "Buildin with pass strength meter support.")
+    message(STATUS "Building with pass strength meter support.")
 else()
     add_definitions(-DDISABLE_PASS_STRENGTH_METER)
 endif()
 
-include(CheckTrezor)  # Trezor support check
 include(CMakePackageConfigHelpers)
 
 # force version update
@@ -147,12 +132,8 @@ 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()
 
 # Sodium
@@ -165,9 +146,11 @@ 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}")
+if(NOT ANDROID)
+  find_package(HIDAPI REQUIRED)
+  message(STATUS "libhidapi: include dir at ${HIDAPI_INCLUDE_DIRS}")
+  message(STATUS "libhidapi: libraries at ${HIDAPI_LIBRARIES}")
+endif()
 
 # Boost
 if(DEBUG)
@@ -176,6 +159,9 @@ 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
@@ -187,8 +173,12 @@ find_package(Boost 1.58 REQUIRED COMPONENTS
 		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}")
@@ -216,9 +206,7 @@ endif()
 set(QT5_LIBRARIES
   Qt5Core
   Qt5Quick
-  Qt5Widgets
   Qt5Gui
-  Qt5Network
   Qt5Qml
   Qt5Svg
   Qt5Xml
@@ -230,15 +218,17 @@ endif()
 
 if(APPLE)
   list(APPEND QT5_LIBRARIES Qt5MacExtras)
+endif()
 
-  if(NOT CMAKE_PREFIX_PATH)
+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(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)
-  endif()
 endif()
 
 find_package(PkgConfig REQUIRED)
@@ -260,7 +250,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")
@@ -268,9 +273,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)
+  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}" "${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})
@@ -291,6 +302,8 @@ if(STATIC)
   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)
@@ -313,6 +326,7 @@ if(STATIC)
     qmlsettingsplugin
     qmlxmllistmodelplugin
     qquicklayoutsplugin
+    modelsplugin
   )
 
   if(WITH_SCANNER)
@@ -331,6 +345,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)
@@ -338,8 +356,6 @@ if(STATIC)
   endforeach()
 
   if(MINGW)
-    list(APPEND QT5_EXTRA_LIBRARIES qtfreetype)
-
     if(CMAKE_BUILD_TYPE STREQUAL "Debug")
       list(APPEND QT5_EXTRA_LIBRARIES D3D11 Dwrite D2d1)
     endif()
@@ -360,10 +376,11 @@ if(STATIC)
   if(UNIX AND NOT APPLE)
     list(APPEND QT5_INTEGRATION_LIBRARIES_LIST
       Qt5XcbQpa
-      xcb-static
       Qt5ServiceSupport
       Qt5GlxSupport
     )
+  elseif(MINGW)
+    list(APPEND QT5_INTEGRATION_LIBRARIES_LIST qtfreetype)
   endif()
 
   foreach(LIBRARY ${QT5_INTEGRATION_LIBRARIES_LIST})
@@ -372,11 +389,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()
 
+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()
+
 message(STATUS "Using Boost include dir at ${Boost_INCLUDE_DIRS}")
 message(STATUS "Using Boost libraries at ${Boost_LIBRARIES}")
 
@@ -455,6 +491,11 @@ if (NOT (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VER
 endif()
 
 # linker
+if (APPLE)
+  add_linker_flag_if_supported(-Wl,-bind_at_load LD_SECURITY_FLAGS)
+  add_linker_flag_if_supported(-Wl,-dead_strip LD_SECURITY_FLAGS)
+  add_linker_flag_if_supported(-Wl,-dead_strip_dylibs LD_SECURITY_FLAGS)
+endif()
 if (NOT APPLE AND NOT (WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "GNU"))
   # Windows binaries die on startup with PIE when compiled with GCC
   add_linker_flag_if_supported(-pie LD_SECURITY_FLAGS)
@@ -513,10 +554,14 @@ if (HIDAPI_FOUND OR LibUSB_COMPILE_TEST_PASSED)
     endif()
   endif()
   if (WIN32)
-    list(APPEND EXTRA_LIBRARIES setupapi Version)
+    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(external)
 add_subdirectory(translations)
-
 add_subdirectory(src)

DEPLOY.md

@@ -2,39 +2,17 @@
 
 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. `export PATH=$PATH:$HOME/Qt5.12.8/5.12.8/clang_64/bin`
+4. `CMAKE_PREFIX_PATH=~/Qt5.12.8/5.12.8/clang_64 make release`
 
-5. `git clone https://github.com/monero-project/monero-gui` 
+5. `cd build/release && make deploy`
 
-6. `git checkout v0.X.Y.Z`
-
-7. `sed -i '' s/ARCH=\"native\"/ARCH=\"x86-64\"/g get_libwallet_api.sh`
-
-8. `sed -i '' s/-O2/-O0/g monero-wallet-gui.pro`
-
-9. `./build.sh`
-
-10. `cd build && make deploy`
-
-11. `cd release/bin/monero-wallet-gui.app/Contents/PlugIns/imageformats/`
-
-12. `cp ~/Qt5.12.8/5.12.8/clang_64/plugins/imageformats/libqsvg.dylib .`
-
-13. `install_name_tool -change ~/Qt5.12.8/5.12.8/clang_64/clang_64/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui libqsvg.dylib`
-
-14. `install_name_tool -change ~/Qt5.12.8/5.12.8/clang_64/clang_64/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui libqsvg.dylib`
-
-15. `install_name_tool -change ~/Qt5.12.8/5.12.8/clang_64/lib/QtSvg.framework/Versions/5/QtSvg @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui libqsvg.dylib`
- 
-16. `install_name_tool -change ~/Qt5.12.8/5.12.8/clang_64/clang_64/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui libqsvg.dylib`
-
-17. Replace the `monerod` binary inside `monero-wallet-gui.app/Contents/MacOS/` with one built using deterministic builds / gitian.
+6. Replace the `monerod` binary inside `monero-wallet-gui.app/Contents/MacOS/` with one built using deterministic builds / gitian.
 
 ## Codesigning and notarizing
 

Dockerfile

@@ -1,185 +0,0 @@
-FROM ubuntu:16.04
-
-ARG THREADS=1
-
-RUN apt update
-
-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 && \
-    cd xorgproto && \
-    git reset --hard c62e8203402cafafa5ba0357b6d1c019156c9f36 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-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 && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN apt install -y libtool-bin && \
-    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 && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN apt install -y libpthread-stubs0-dev && \
-    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 && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-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 && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN git clone -b VER-2-10-2 --depth 1 https://git.sv.nongnu.org/r/freetype/freetype2.git && \
-    cd freetype2 && \
-    git reset --hard 132f19b779828b194b3fede187cee719785db4d8 && \
-    ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --with-zlib=no && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-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 && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN apt install -y autopoint gettext gperf libpng12-dev && \
-    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 && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-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 && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-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 -xvzf boost_1_73_0.tar.gz && \
-    cd boost_1_73_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
-
-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 && \
-    cd openssl-1.1.1g && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./config no-asm no-shared no-zlib-dynamic --openssldir=/usr && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN wget https://download.qt.io/archive/qt/5.9/5.9.7/single/qt-everywhere-opensource-src-5.9.7.tar.xz && \
-    echo "1c3852aa48b5a1310108382fb8f6185560cefc3802e81ecc099f4e62ee38516c qt-everywhere-opensource-src-5.9.7.tar.xz"  > hashsum.txt && \
-    sha256sum -c hashsum.txt && \
-    tar -xf qt-everywhere-opensource-src-5.9.7.tar.xz
-
-RUN apt install -y libgl1-mesa-dev libglib2.0-dev libxkbcommon-dev && \
-    cd qt-everywhere-opensource-src-5.9.7 && \
-    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 && \
-    ./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 \
-    -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 \
-    -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 serialbus -skip location -skip webengine \
-    -nomake examples -nomake tests -nomake tools && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN cd qt-everywhere-opensource-src-5.9.7/qttools/src/linguist/lrelease && \
-    qmake && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN apt install -y libudev-dev && \
-    git clone -b v1.0.23 --depth 1 https://github.com/libusb/libusb && \
-    cd libusb && \
-    git reset --hard e782eeb2514266f6738e242cdcb18e3ae1ed06fa && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN git clone -b hidapi-0.9.0 --depth 1 https://github.com/libusb/hidapi && \
-    cd hidapi && \
-    git reset --hard 7da5cc91fc0d2dbe4df4f08cd31f6ca1a262418f && \
-    ./bootstrap && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-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
-
-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
-
-RUN apt install -y libsodium-dev && \
-    git clone -b v4.3.2 --depth 1 https://github.com/zeromq/libzmq && \
-    cd libzmq && \
-    git reset --hard a84ffa12b2eb3569ced199660bac5ad128bff1f0 && \
-    ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-libunwind --with-libsodium && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN git clone -b libgpg-error-1.38 --depth 1 git://git.gnupg.org/libgpg-error.git && \
-    cd libgpg-error && \
-    git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 && \
-    ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-doc --disable-tests && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN git clone -b libgcrypt-1.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git && \
-    cd libgcrypt && \
-    git reset --hard 56606331bc2a80536db9fc11ad53695126007298 && \
-    ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-doc && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN git clone -b v3.10.0 --depth 1 https://github.com/protocolbuffers/protobuf && \
-    cd protobuf && \
-    git reset --hard 6d4e7fd7966c989e38024a8ea693db83758944f1 && \
-    ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --enable-static --disable-shared && \
-    make -j$THREADS && \
-    make -j$THREADS install
-
-RUN apt install -y cmake libusb-1.0-0-dev

Dockerfile.android

@@ -0,0 +1,207 @@
+FROM debian:stretch
+
+ARG THREADS=1
+ARG ANDROID_NDK_REVISION=21d
+ARG ANDROID_NDK_HASH=bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d
+ARG ANDROID_SDK_REVISION=4333796
+ARG ANDROID_SDK_HASH=92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
+ARG QT_VERSION=5.15.2
+
+WORKDIR /opt/android
+ENV WORKDIR=/opt/android
+
+ENV ANDROID_NATIVE_API_LEVEL=28
+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}/tools
+ENV JAVA_HOME=/usr/lib/jvm/java-8-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-8-jdk-headless openjdk-8-jre-headless pkg-config python3 \
+    unzip wget
+
+RUN wget -q https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_REVISION}.zip \
+    && unzip -q sdk-tools-linux-${ANDROID_SDK_REVISION}.zip \
+    && rm -f sdk-tools-linux-${ANDROID_SDK_REVISION}.zip
+
+RUN wget -q https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip \
+    && unzip -q android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip \
+    && rm -f android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip
+
+RUN cd ${ANDROID_SDK_ROOT} && echo y | ./bin/sdkmanager "platform-tools" "platforms;${ANDROID_API}" "tools" > /dev/null
+RUN cp -r ${WORKDIR}/platforms ${WORKDIR}/platform-tools ${ANDROID_SDK_ROOT}
+
+ENV HOST_PATH=${PATH}
+ENV PATH=${TOOLCHAIN_DIR}/aarch64-linux-android/bin:${TOOLCHAIN_DIR}/bin:${PATH}
+
+ARG ZLIB_VERSION=1.2.11
+ARG ZLIB_HASH=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+RUN wget -q https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
+    && 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 \
+    && sed -i '213,215d' qtbase/src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h \
+    && 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://dl.bintray.com/boostorg/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.1g
+ARG OPENSSL_HASH=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
+    && 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 ZMQ_VERSION=v4.3.3
+ARG ZMQ_HASH=04f5bbedee58c538934374dc45182d8fc5926fa3
+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.38 --depth 1 git://git.gnupg.org/libgpg-error.git \
+    && cd libgpg-error \
+    && git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 \
+    && ./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.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git \
+    && cd libgcrypt \
+    && git reset --hard 56606331bc2a80536db9fc11ad53695126007298 \
+    && ./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 cd tools \
+    && wget -q http://dl-ssl.google.com/android/repository/tools_r25.2.5-linux.zip \
+    && unzip -q tools_r25.2.5-linux.zip \
+    && rm -f tools_r25.2.5-linux.zip \
+    && echo y | ${ANDROID_SDK_ROOT}/tools/android update sdk --no-ui --all --filter build-tools-28.0.3
+
+RUN git clone -b v3.19.7 --depth 1 https://github.com/Kitware/CMake \
+    && cd CMake \
+    && git reset --hard 22612dd53a46c7f9b4c3f4b7dbe5c78f9afd9581 \
+    && 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" \
+    -DWITH_SCANNER=ON \
+    ../../.. \
+    && PATH=${HOST_PATH} make generate_translations_header \
+    && make -j${THREADS} -C src \
+    && make -j${THREADS} apk

Dockerfile.linux

@@ -0,0 +1,284 @@
+FROM ubuntu:16.04
+
+ARG THREADS=1
+ARG QT_VERSION=5.15.2
+
+ENV CFLAGS="-fPIC"
+ENV CPPFLAGS="-fPIC"
+ENV CXXFLAGS="-fPIC"
+ENV SOURCE_DATE_EPOCH=1397818193
+
+RUN apt update
+
+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 && \
+    cd xorgproto && \
+    git reset --hard c62e8203402cafafa5ba0357b6d1c019156c9f36 && \
+    ./autogen.sh && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b 1.12 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xcbproto && \
+    cd xcbproto && \
+    git reset --hard 6398e42131eedddde0d98759067dde933191f049 && \
+    ./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 && \
+    cd libxau && \
+    git reset --hard d9443b2c57b512cfb250b35707378654d86c7dea && \
+    ./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 && \
+    cd libxcb && \
+    git reset --hard d34785a34f28fa6a00f8ce00d87e3132ff0f6467 && \
+    ./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 f662e3a93ebdec3d1c9374382dcc070093a42fed && \
+    ./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 f662e3a93ebdec3d1c9374382dcc070093a42fed && \
+    ./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 f662e3a93ebdec3d1c9374382dcc070093a42fed && \
+    ./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 f662e3a93ebdec3d1c9374382dcc070093a42fed && \
+    ./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 f662e3a93ebdec3d1c9374382dcc070093a42fed && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN apt install -y bison && \
+    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)
+
+RUN git clone -b v1.2.11 --depth 1 https://github.com/madler/zlib && \
+    cd zlib && \
+    git reset --hard cacf7f1d4e3d44d871b605da3b647f07d718623f && \
+    ./configure --static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+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 && \
+    ./configure --disable-shared --enable-static --with-zlib=no && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b R_2_2_9 --depth 1 https://github.com/libexpat/libexpat && \
+    cd libexpat/expat && \
+    git reset --hard a7bc26b69768f7fb24f0c7976fae24b157b85b13 && \
+    ./buildconf.sh && \
+    ./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 && \
+    cd fontconfig && \
+    git reset --hard b1df1101a643ae16cdfa1d83b939de2497b1bf27 && \
+    ./autogen.sh --disable-shared --enable-static --sysconfdir=/etc --localstatedir=/var && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b release-64-2 --depth 1 https://github.com/unicode-org/icu && \
+    cd icu/icu4c/source && \
+    git reset --hard e2d85306162d3a0691b070b4f0a73e4012433444 && \
+    ./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" | sha256sum -c && \
+    tar -xzf boost_1_73_0.tar.gz && \
+    rm boost_1_73_0.tar.gz && \
+    cd boost_1_73_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="${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" | sha256sum -c && \
+    tar -xzf openssl-1.1.1g.tar.gz && \
+    rm openssl-1.1.1g.tar.gz && \
+    cd openssl-1.1.1g && \
+    ./config no-asm no-shared no-zlib-dynamic --openssldir=/usr && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN apt install -y libgl1-mesa-dev libglib2.0-dev mesa-common-dev && \
+    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 -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 \
+    -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 serialbus -skip location -skip webengine \
+    -nomake examples -nomake tests -nomake tools && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    cd qttools/src/linguist/lrelease && \
+    ../../../../qtbase/bin/qmake && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    cd ../../../.. && \
+    rm -rf $(pwd)
+
+RUN apt install -y libudev-dev && \
+    git clone -b v1.0.23 --depth 1 https://github.com/libusb/libusb && \
+    cd libusb && \
+    git reset --hard e782eeb2514266f6738e242cdcb18e3ae1ed06fa && \
+    ./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 && \
+    cd hidapi && \
+    git reset --hard 7da5cc91fc0d2dbe4df4f08cd31f6ca1a262418f && \
+    ./bootstrap && \
+    ./configure --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 && \
+    cd libzmq && \
+    git reset --hard a84ffa12b2eb3569ced199660bac5ad128bff1f0 && \
+    ./autogen.sh && \
+    ./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 && \
+    cd libgpg-error && \
+    git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 && \
+    ./autogen.sh && \
+    ./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 && \
+    cd libgcrypt && \
+    git reset --hard 56606331bc2a80536db9fc11ad53695126007298 && \
+    ./autogen.sh && \
+    ./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 && \
+    cd protobuf && \
+    git reset --hard 6d4e7fd7966c989e38024a8ea693db83758944f1 && \
+    ./autogen.sh && \
+    ./configure --enable-static --disable-shared && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b v3.18.4 --depth 1 https://github.com/Kitware/CMake && \
+    cd CMake && \
+    git reset --hard 3cc3d42aba879fff5e85b363ae8f21386a3f9f9b && \
+    ./bootstrap && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN apt install -y libusb-1.0-0-dev

Dockerfile.windows

@@ -0,0 +1,82 @@
+FROM ubuntu:20.04
+
+ARG THREADS=1
+ARG QT_VERSION=5.15.2
+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 \
+    python && \
+    rm -rf /var/lib/apt/lists/*
+
+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 && \
+    cd monero && \
+    git reset --hard d27d4526fe89b7cdeb4b296280c4a6cf7efe21f8 && \
+    cp -a contrib/depends / && \
+    cd .. && \
+    rm -rf monero
+
+RUN make -j$THREADS -C /depends HOST=x86_64-w64-mingw32 NO_QT=1
+
+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 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 -j$THREADS && \
+    make -j$THREADS install && \
+    cd qttools/src/linguist/lrelease && \
+    ../../../../qtbase/bin/qmake && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    cd ../../../.. && \
+    rm -rf $(pwd)
+
+RUN git clone -b libgpg-error-1.38 --depth 1 git://git.gnupg.org/libgpg-error.git && \
+    cd libgpg-error && \
+    git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 && \
+    ./autogen.sh && \
+    ./configure --disable-shared --enable-static --disable-doc --disable-tests \
+    --host=x86_64-w64-mingw32 --prefix=/depends/x86_64-w64-mingw32 && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    cd .. && \
+    rm -rf libgpg-error
+
+RUN git clone -b libgcrypt-1.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git && \
+    cd libgcrypt && \
+    git reset --hard 56606331bc2a80536db9fc11ad53695126007298 && \
+    ./autogen.sh && \
+    ./configure --disable-shared --enable-static --disable-doc \
+    --host=x86_64-w64-mingw32 --prefix=/depends/x86_64-w64-mingw32 \
+    --with-gpg-error-prefix=/depends/x86_64-w64-mingw32 && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    cd .. && \
+    rm -rf libgcrypt

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
@@ -221,7 +214,7 @@ Rectangle {
                 MoneroComponents.Label {
                     fontSize: 16
                     visible: isSyncing
-                    text: qsTr("Syncing...")
+                    text: qsTr("Syncing...") + translationManager.emptyString
                     color: MoneroComponents.Style.blackTheme ? "white" : "black"
                     anchors.left: parent.left
                     anchors.leftMargin: 20
@@ -480,6 +473,7 @@ Rectangle {
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = advancedButton
+                    panel.advancedClicked()
                 }
             }
 
@@ -490,98 +484,6 @@ 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

Makefile

@@ -1,48 +1,69 @@
 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'`)
-ifeq ($(USE_SINGLE_BUILDDIR),)
-  builddir := build/"$(subbuilddir)"
-  topdir   := ../../../..
-  deldirs  := $(builddir)
+builddir := build
+topdir := ../..
+ifeq ($(USE_SINGLE_BUILDDIR), OFF)
+  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
-  builddir := build
-  topdir   := ../..
-  deldirs  := $(builddir)/debug $(builddir)/release $(builddir)/fuzz
+  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 ARCH="x86-64" -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} .. && $(MAKE) VERBOSE=1
+
+depends:
+	mkdir -p build/$(target)/release
+	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 ARCH="x86-64" -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 ARCH="x86-64" -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 ARCH="x86-64" -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-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=release -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,22 +51,19 @@ 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);
@@ -136,30 +133,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 +153,7 @@ Rectangle {
                 name: "Account"
                 PropertyChanges { target: root; currentView: accountView }
                 PropertyChanges { target: mainFlickable; contentHeight: accountView.accountHeight + 80 }
-            }	
+            }
         ]
 
     ColumnLayout {

README.md

@@ -40,15 +40,13 @@ The Monero donation address is: `888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnj
 
 The Bitcoin donation address is: `1KTexdemPdxSBcG55heUuTjDRYqbC5ZL8H`
 
-GUI development funding and/or some supporting services are also graciously provided by sponsors:
+GUI development funding and/or some supporting services are also graciously provided by [sponsors](https://www.getmonero.org/community/sponsorships/):
 
-[<img width="80" src="https://static.getmonero.org/images/sponsors/mymonero.png"/>](https://mymonero.com)
-[<img width="150" src="https://static.getmonero.org/images/sponsors/kitware.png?1"/>](http://kitware.com)
-[<img width="100" src="https://static.getmonero.org/images/sponsors/dome9.png"/>](http://dome9.com)
-[<img width="150" src="https://static.getmonero.org/images/sponsors/araxis.png"/>](http://araxis.com)
-[<img width="150" src="https://static.getmonero.org/images/sponsors/jetbrains.png"/>](http://www.jetbrains.com/)
-[<img width="150" src="https://static.getmonero.org/images/sponsors/navicat.png"/>](http://www.navicat.com/)
-[<img width="150" src="https://static.getmonero.org/images/sponsors/symas.png"/>](http://www.symas.com/)
+[<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://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).
 
@@ -70,10 +68,11 @@ Status of the translations:
 ## Installing the Monero GUI from a package
 
 Packages are available for
-
-* Arch Linux: pacman -S monero-gui
-* Void Linux: xbps-install -S monero-core
-* GuixSD: guix package -i monero-core
+* 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`
+* GuixSD: `guix package -i monero-gui`
+* macOS (homebrew): `brew install --cask monero-wallet`
 
 Packaging for your favorite distribution would be a welcome contribution!
 
@@ -81,8 +80,60 @@ 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 Linux static binaries with Docker (any OS)
+### 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 --branch master --recursive https://github.com/monero-project/monero-gui.git
+   ```
+   \* `master` - replace with the desired version tag (e.g. `v0.17.1.9`) to build the release binaries.
+3. Prepare build environment
+   ```
+   cd monero-gui
+   docker build --tag monero:build-env-windows --build-arg THREADS=4 --file Dockerfile.windows .
+   ```
+   \* `4` - number of CPU threads to use
+
+4. Build
+   ```
+   docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -w /monero-gui monero:build-env-windows sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j4'
+   ```
+   \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory  
+   \* `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 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 --branch master --recursive https://github.com/monero-project/monero-gui.git
+   ```
+   \* `master` - replace with the desired version tag (e.g. `v0.17.1.9`) to build the release binaries.
+3. Prepare build environment
+   ```
+   cd monero-gui
+   docker build --tag monero:build-env-linux --build-arg THREADS=4 --file Dockerfile.linux .
+   ```
+   \* `4` - number of CPU threads to use
+
+4. Build
+   ```
+   docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'make release-static -j4'
+   ```
+   \* `<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  
+
+### 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
    ```
@@ -91,17 +142,43 @@ Packaging for your favorite distribution would be a welcome contribution!
 3. Prepare build environment
    ```
    cd monero-gui
-   docker build --tag monero:build-env-gui --build-arg THREADS=4 .
+   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 -w /monero-gui monero:build-env-gui sh -c 'USE_SINGLE_BUILDDIR=ON DEV_MODE=ON make release-static -j4'
+   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 Linux static binaries will be placed in  `monero-gui/build/release/bin` directory
+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
+      ```
 
 ### On Linux:
 
@@ -131,7 +208,7 @@ 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-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev`
 
   - For Gentoo
 
@@ -141,25 +218,29 @@ 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
 
       The *qml* USE flag must be enabled.
 
-      `emerge dev-qt/qtmultimedia:5 media-gfx/zbar`
+      `emerge dev-qt/qtmultimedia:5`
 
 
 3. Clone repository
 
-    `git clone https://github.com/monero-project/monero-gui.git`
+    ```
+    git clone --recursive https://github.com/monero-project/monero-gui.git
+    cd monero-gui
+    ```
 
 4. Build
 
     ```
-    cd monero-gui
-    QT_SELECT=5 ./build.sh
+    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/gcc_64 make release -j4`
 
 The executable can be found in the build/release/bin folder.
 
@@ -171,28 +252,26 @@ 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 boost hidapi zmq libpgm libsodium miniupnpc ldns expat libunwind-headers protobuf libgcrypt`
 
 4. Install Qt:
 
   `brew install qt5`  (or download QT 5.9.7+ from [qt.io](https://www.qt.io/download-open-source/))
 
-5. Add the Qt bin directory to your path
+5. Grab an up-to-date copy of the monero-gui repository
 
-  - Example for Qt: `export PATH=$PATH:$HOME/Qt/5.9.7/clang_64/bin`
-  - Example for Homebrew: `export PATH=$PATH:/usr/local/opt/qt/bin`
+   ```
+   git clone --recursive https://github.com/monero-project/monero-gui.git
+   cd monero-gui
+   ```
 
-6. Grab an up-to-date copy of the monero-gui repository
+6. Start the build
 
-  `git clone https://github.com/monero-project/monero-gui.git`
-
-7. Go into the repository
-
-  `cd monero-gui`
-
-8. Start the build
-
-  `./build.sh`
+    ```
+    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`
 
 The executable can be found in the `build/release/bin` folder.
 
@@ -212,12 +291,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
@@ -237,18 +310,17 @@ The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not off
 6. Clone repository
 
     ```
-    git clone https://github.com/monero-project/monero-gui.git
+    git clone --recursive https://github.com/monero-project/monero-gui.git
+    cd monero-gui
     ```
 
 7. Build
 
     ```
-    cd monero-gui
-    source ./build.sh release-static
-    cd build
+    make release-win64 -j4
+    cd build/release
     make deploy
     ```
+    \* `4` - number of CPU threads to use
 
-    **Note:** The use of `source` above is a dirty workaround for a suspected bug in the current QT version 5.11.2-3 available in the MSYS2 packaging system, see https://github.com/monero-project/monero-gui/issues/1559 for more info.
-
-The executable can be found in the `.\release\bin` directory.
+The executable can be found in the `.\bin` directory.

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/CheckTrezor.cmake

@@ -1,181 +0,0 @@
-OPTION(USE_DEVICE_TREZOR "Trezor support compilation" ON)
-OPTION(USE_DEVICE_TREZOR_LIBUSB "Trezor LibUSB compilation" ON)
-OPTION(USE_DEVICE_TREZOR_UDP_RELEASE "Trezor UdpTransport in release mode" OFF)
-OPTION(USE_DEVICE_TREZOR_DEBUG "Trezor Debugging enabled" OFF)
-OPTION(TREZOR_DEBUG "Main trezor debugging switch" OFF)
-
-# Helper function to fix cmake < 3.6.0 FindProtobuf variables
-function(_trezor_protobuf_fix_vars)
-    if(${CMAKE_VERSION} VERSION_LESS "3.6.0")
-        foreach(UPPER
-                PROTOBUF_SRC_ROOT_FOLDER
-                PROTOBUF_IMPORT_DIRS
-                PROTOBUF_DEBUG
-                PROTOBUF_LIBRARY
-                PROTOBUF_PROTOC_LIBRARY
-                PROTOBUF_INCLUDE_DIR
-                PROTOBUF_PROTOC_EXECUTABLE
-                PROTOBUF_LIBRARY_DEBUG
-                PROTOBUF_PROTOC_LIBRARY_DEBUG
-                PROTOBUF_LITE_LIBRARY
-                PROTOBUF_LITE_LIBRARY_DEBUG
-                )
-            if (DEFINED ${UPPER})
-                string(REPLACE "PROTOBUF_" "Protobuf_" Camel ${UPPER})
-                if (NOT DEFINED ${Camel})
-                    set(${Camel} ${${UPPER}} PARENT_SCOPE)
-                endif()
-            endif()
-        endforeach()
-    endif()
-endfunction()
-
-# Use Trezor master switch
-if (USE_DEVICE_TREZOR)
-    # Protobuf is required to build protobuf messages for Trezor
-    include(FindProtobuf OPTIONAL)
-    find_package(Protobuf)
-    _trezor_protobuf_fix_vars()
-
-    # Protobuf handling the cache variables set in docker.
-    if(NOT Protobuf_FOUND AND NOT Protobuf_LIBRARY AND NOT Protobuf_PROTOC_EXECUTABLE AND NOT Protobuf_INCLUDE_DIR)
-        message(STATUS "Could not find Protobuf")
-    elseif(NOT Protobuf_LIBRARY OR NOT EXISTS "${Protobuf_LIBRARY}")
-        message(STATUS "Protobuf library not found: ${Protobuf_LIBRARY}")
-        unset(Protobuf_FOUND)
-    elseif(NOT Protobuf_PROTOC_EXECUTABLE OR NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
-        message(STATUS "Protobuf executable not found: ${Protobuf_PROTOC_EXECUTABLE}")
-        unset(Protobuf_FOUND)
-    elseif(NOT Protobuf_INCLUDE_DIR OR NOT EXISTS "${Protobuf_INCLUDE_DIR}")
-        message(STATUS "Protobuf include dir not found: ${Protobuf_INCLUDE_DIR}")
-        unset(Protobuf_FOUND)
-    else()
-        message(STATUS "Protobuf lib: ${Protobuf_LIBRARY}, inc: ${Protobuf_INCLUDE_DIR}, protoc: ${Protobuf_PROTOC_EXECUTABLE}")
-        set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIR})
-        set(Protobuf_FOUND 1)  # override found if all rquired info was provided by variables
-    endif()
-
-    if(TREZOR_DEBUG)
-        set(USE_DEVICE_TREZOR_DEBUG 1)
-    endif()
-
-    # Compile debugging support (for tests)
-    if (USE_DEVICE_TREZOR_DEBUG)
-        add_definitions(-DWITH_TREZOR_DEBUGGING=1)
-    endif()
-else()
-    message(STATUS "Trezor support disabled by USE_DEVICE_TREZOR")
-endif()
-
-if(Protobuf_FOUND AND USE_DEVICE_TREZOR)
-    if (NOT "$ENV{TREZOR_PYTHON}" STREQUAL "")
-        set(TREZOR_PYTHON "$ENV{TREZOR_PYTHON}" CACHE INTERNAL "Copied from environment variable TREZOR_PYTHON")
-    else()
-        find_package(Python QUIET COMPONENTS Interpreter)  # cmake 3.12+
-        if(Python_Interpreter_FOUND)
-            set(TREZOR_PYTHON "${Python_EXECUTABLE}")
-        endif()
-    endif()
-
-    if(NOT TREZOR_PYTHON)
-        find_package(PythonInterp)
-        if(PYTHONINTERP_FOUND AND PYTHON_EXECUTABLE)
-            set(TREZOR_PYTHON "${PYTHON_EXECUTABLE}")
-        endif()
-    endif()
-
-    if(NOT TREZOR_PYTHON)
-        message(STATUS "Trezor: Python not found")
-    endif()
-endif()
-
-# Protobuf compilation test
-if(Protobuf_FOUND AND USE_DEVICE_TREZOR AND TREZOR_PYTHON)
-    execute_process(COMMAND ${Protobuf_PROTOC_EXECUTABLE} -I "${CMAKE_SOURCE_DIR}/cmake" -I "${Protobuf_INCLUDE_DIR}" "${CMAKE_SOURCE_DIR}/cmake/test-protobuf.proto" --cpp_out ${CMAKE_BINARY_DIR} RESULT_VARIABLE RET OUTPUT_VARIABLE OUT ERROR_VARIABLE ERR)
-    if(RET)
-        message(STATUS "Protobuf test generation failed: ${OUT} ${ERR}")
-    endif()
-
-    try_compile(Protobuf_COMPILE_TEST_PASSED
-        "${CMAKE_BINARY_DIR}"
-        SOURCES
-        "${CMAKE_BINARY_DIR}/test-protobuf.pb.cc"
-        "${CMAKE_SOURCE_DIR}/cmake/test-protobuf.cpp"
-        CMAKE_FLAGS
-        "-DINCLUDE_DIRECTORIES=${Protobuf_INCLUDE_DIR};${CMAKE_BINARY_DIR}"
-        "-DCMAKE_CXX_STANDARD=11"
-        LINK_LIBRARIES ${Protobuf_LIBRARY}
-        OUTPUT_VARIABLE OUTPUT
-    )
-    if(NOT Protobuf_COMPILE_TEST_PASSED)
-        message(STATUS "Protobuf Compilation test failed: ${OUTPUT}.")
-    endif()
-endif()
-
-# Try to build protobuf messages
-if(Protobuf_FOUND AND USE_DEVICE_TREZOR AND TREZOR_PYTHON AND Protobuf_COMPILE_TEST_PASSED)
-    set(ENV{PROTOBUF_INCLUDE_DIRS} "${Protobuf_INCLUDE_DIR}")
-    set(ENV{PROTOBUF_PROTOC_EXECUTABLE} "${Protobuf_PROTOC_EXECUTABLE}")
-    set(TREZOR_PROTOBUF_PARAMS "")
-    if (USE_DEVICE_TREZOR_DEBUG)
-        set(TREZOR_PROTOBUF_PARAMS "--debug")
-    endif()
-    
-    execute_process(COMMAND ${TREZOR_PYTHON} tools/build_protob.py ${TREZOR_PROTOBUF_PARAMS} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero/src/device_trezor/trezor RESULT_VARIABLE RET OUTPUT_VARIABLE OUT ERROR_VARIABLE ERR)
-    if(RET)
-        message(WARNING "Trezor protobuf messages could not be regenerated (err=${RET}, python ${PYTHON})."
-                "OUT: ${OUT}, ERR: ${ERR}."
-                "Please read src/device_trezor/trezor/tools/README.md")
-    else()
-        message(STATUS "Trezor protobuf messages regenerated out: \"${OUT}.\"")
-        set(DEVICE_TREZOR_READY 1)
-        add_definitions(-DDEVICE_TREZOR_READY=1)
-        add_definitions(-DPROTOBUF_INLINE_NOT_IN_HEADERS=0)
-
-        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-            add_definitions(-DTREZOR_DEBUG=1)
-        endif()
-
-        if(USE_DEVICE_TREZOR_UDP_RELEASE)
-            add_definitions(-DUSE_DEVICE_TREZOR_UDP_RELEASE=1)
-        endif()
-
-        if (Protobuf_INCLUDE_DIR)
-            include_directories(${Protobuf_INCLUDE_DIR})
-        endif()
-
-        # LibUSB support, check for particular version
-        # Include support only if compilation test passes
-        if (USE_DEVICE_TREZOR_LIBUSB)
-            find_package(LibUSB)
-        endif()
-
-        if (LibUSB_COMPILE_TEST_PASSED)
-            add_definitions(-DHAVE_TREZOR_LIBUSB=1)
-            if(LibUSB_INCLUDE_DIRS)
-                include_directories(${LibUSB_INCLUDE_DIRS})
-            endif()
-        endif()
-
-        set(TREZOR_LIBUSB_LIBRARIES "")
-        if(LibUSB_COMPILE_TEST_PASSED)
-            list(APPEND TREZOR_LIBUSB_LIBRARIES ${LibUSB_LIBRARIES})
-            message(STATUS "Trezor compatible LibUSB found at: ${LibUSB_INCLUDE_DIRS}")
-        endif()
-
-        if (BUILD_GUI_DEPS)
-            set(TREZOR_DEP_LIBS "")
-            set(TREZOR_DEP_LINKER "")
-
-            if (Protobuf_LIBRARY)
-                list(APPEND TREZOR_DEP_LIBS ${Protobuf_LIBRARY})
-                string(APPEND TREZOR_DEP_LINKER " -lprotobuf")
-            endif()
-
-            if (TREZOR_LIBUSB_LIBRARIES)
-                list(APPEND TREZOR_DEP_LIBS ${TREZOR_LIBUSB_LIBRARIES})
-                string(APPEND TREZOR_DEP_LINKER " -lusb-1.0")
-            endif()
-        endif()
-    endif()
-endif()

cmake/Deploy.cmake

@@ -0,0 +1,103 @@
+if(APPLE OR (WIN32 AND NOT STATIC))
+    add_custom_target(deploy)
+    get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
+    get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
+
+    if(APPLE AND NOT IOS)
+        find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}")
+        add_custom_command(TARGET deploy
+                           POST_BUILD
+                           COMMAND "${MACDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE_DIR:monero-wallet-gui>/../.." -always-overwrite -qmldir="${CMAKE_SOURCE_DIR}"
+                           COMMENT "Running macdeployqt..."
+        )
+
+        # workaround for a Qt bug that requires manually adding libqsvg.dylib to bundle
+        find_file(_qt_svg_dylib "libqsvg.dylib" PATHS "${CMAKE_PREFIX_PATH}/plugins/imageformats" NO_DEFAULT_PATH)
+        if(_qt_svg_dylib)
+            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"
+            )
+        endif()
+
+    elseif(WIN32)
+        find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
+        add_custom_command(TARGET monero-wallet-gui POST_BUILD
+                           COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE:monero-wallet-gui>" -no-translations -qmldir="${CMAKE_SOURCE_DIR}"
+                           COMMENT "Running windeployqt..."
+        )
+        set(WIN_DEPLOY_DLLS
+            libboost_chrono-mt.dll
+            libboost_filesystem-mt.dll
+            libboost_locale-mt.dll
+            libboost_program_options-mt.dll
+            libboost_regex-mt.dll
+            libboost_serialization-mt.dll
+            libboost_thread-mt.dll
+            libprotobuf.dll
+            libbrotlicommon.dll
+            libbrotlidec.dll
+            libusb-1.0.dll
+            zlib1.dll
+            libzstd.dll
+            libwinpthread-1.dll
+            libtiff-5.dll
+            libstdc++-6.dll
+            libpng16-16.dll
+            libpcre16-0.dll
+            libpcre-1.dll
+            libmng-2.dll
+            liblzma-5.dll
+            liblcms2-2.dll
+            libjpeg-8.dll
+            libintl-8.dll
+            libiconv-2.dll
+            libharfbuzz-0.dll
+            libgraphite2.dll
+            libglib-2.0-0.dll
+            libfreetype-6.dll
+            libbz2-1.dll
+            libssp-0.dll
+            libpcre2-16-0.dll
+            libhidapi-0.dll
+            libdouble-conversion.dll
+            libgcrypt-20.dll
+            libgpg-error-0.dll
+            libsodium-23.dll
+            libzmq.dll
+            #platform files
+            libgcc_s_seh-1.dll
+            #openssl files
+            libssl-1_1-x64.dll
+            libcrypto-1_1-x64.dll
+        )
+        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+            list(APPEND WIN_DEPLOY_DLLS
+                libicudtd67.dll
+                libicuind67.dll
+                libicuiod67.dll
+                libicutud67.dll
+                libicuucd67.dll
+            )
+        else() # assume release
+            list(APPEND WIN_DEPLOY_DLLS
+                libicudt67.dll
+                libicuin67.dll
+                libicuio67.dll
+                libicutu67.dll
+                libicuuc67.dll
+            )
+        endif()
+        list(TRANSFORM WIN_DEPLOY_DLLS PREPEND "$ENV{MSYSTEM_PREFIX}/bin/")
+        add_custom_command(TARGET deploy
+                           POST_BUILD
+                           COMMAND ${CMAKE_COMMAND} -E copy ${WIN_DEPLOY_DLLS} "$<TARGET_FILE_DIR:monero-wallet-gui>"
+                           COMMENT "Copying DLLs to target folder"
+        )
+    endif()
+endif()

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/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/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/test-protobuf.proto

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

components/CheckBox.qml

@@ -49,8 +49,14 @@ Item {
     property alias fontColor: label.color
     property bool iconOnTheLeft: true
     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 +82,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;
@@ -109,6 +115,7 @@ Item {
             color: MoneroComponents.Style.defaultFontColor
             textFormat: Text.RichText
             wrapMode: Text.NoWrap
+            visible: text != ""
         }
     }
 

components/DaemonManagerDialog.qml

@@ -52,6 +52,7 @@ Window {
     // TODO: implement without hardcoding sizes
     width: 480
     height: 200
+    color: MoneroComponents.Style.middlePanelBackgroundColor
 
     // Make window draggable
     MouseArea {
@@ -96,7 +97,7 @@ Window {
                 Layout.fillWidth: true
                 horizontalAlignment: Text.AlignHCenter
                 themeTransition: false
-                color: "black"
+                color: MoneroComponents.Style.defaultFontColor
             }
 
         }

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/InlineButton.qml

@@ -30,30 +30,25 @@ 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 bool isFontAwesomeIcon: fontFamily == FontAwesome.fontFamily || fontFamily == FontAwesome.fontFamilySolid
     property alias buttonColor: rect.color
-    property alias buttonHeight: rect.height
+
+    height: isFontAwesomeIcon ? 30 : 24
+    width: isFontAwesomeIcon ? height : inlineText.width + 16
+
     signal clicked()
 
     function doClick() {
@@ -64,20 +59,16 @@ Item {
 
     Rectangle{
         id: rect
+        anchors.fill: parent
         color: MoneroComponents.Style.buttonInlineBackgroundColor
-        height: 24
-        width: inlineText.text ? (inlineText.width + 16) : inlineButton.icon ? (inlineImage.width + 16) : rect.height
         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,13 +81,6 @@ Item {
             }
         }
 
-        Image {
-            id: inlineImage
-            visible: inlineButton.icon !== ""
-            anchors.centerIn: parent
-            source: inlineButton.icon
-        }
-
         MouseArea {
             id: buttonArea
             cursorShape: rect.enabled ? Qt.PointingHandCursor : Qt.ArrowCursor

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

@@ -131,9 +131,9 @@ Drawer {
                             translationManager.setLanguage(locale_spl[0]);
 
                             // set wizard language settings
-                            wizard.language_locale = locale;
-                            wizard.language_wallet = wallet_language;
-                            wizard.language_language = display_name;
+                            persistentSettings.locale = locale;
+                            persistentSettings.language = display_name;
+                            persistentSettings.language_wallet = wallet_language;
 
                             appWindow.showStatusMessage(qsTr("Language changed."), 3);
                             appWindow.toggleLanguageView();

components/LineEdit.qml

@@ -29,11 +29,15 @@
 import FontAwesome 1.0
 import QtQuick 2.9
 import QtGraphicalEffects 1.0
+import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
 
 Item {
     id: item
+
+    default property alias content: inlineButtons.children
+
     property alias input: input
     property alias text: input.text
 
@@ -48,13 +52,20 @@ Item {
     property int placeholderFontSize: 18
     property string placeholderColor: MoneroComponents.Style.defaultFontColor
     property real placeholderOpacity: 0.35
+    property real placeholderLeftMargin: {
+        if (placeholderCenter) {
+            return undefined;
+        } else if (inlineIcon.visible) {
+            return inlineIcon.width + inlineIcon.anchors.leftMargin + inputPadding;
+        } else {
+            return inputPadding;
+        }
+    }
 
     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 alias copyButtonText: copyButtonId.text
@@ -71,6 +82,7 @@ Item {
         }
     }
 
+    property string fontFamily: MoneroComponents.Style.fontRegular.name
     property int fontSize: 18
     property bool fontBold: false
     property alias fontColor: input.color
@@ -86,14 +98,16 @@ Item {
     property alias labelHorizontalAlignment: inputLabel.horizontalAlignment
     property bool showingHeader: inputLabel.text !== "" || copyButton
     property int inputHeight: 42
+    property int inputPadding: 10
 
     signal labelLinkActivated(); // input label, rich text <a> signal
     signal editingFinished();
     signal accepted();
     signal textUpdated();
 
-    height: showingHeader ? (inputLabel.height + inputItem.height + 2) : 42
+    height: showingHeader ? (inputLabel.height + inputItem.height + 2) : inputHeight
 
+    onActiveFocusChanged: activeFocus && input.forceActiveFocus()
     onTextUpdated: {
         // check to remove placeholder text when there is content
         if(item.isEmpty()){
@@ -174,7 +188,7 @@ Item {
         id: inputItem
         height: inputHeight
         anchors.top: showingHeader ? inputLabel.bottom : parent.top
-        anchors.topMargin: showingHeader ? 12 : 2
+        anchors.topMargin: showingHeader ? 12 : 0
         width: parent.width
         clip: true
 
@@ -184,13 +198,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
@@ -204,7 +212,7 @@ Item {
         Rectangle {
             anchors.fill: parent
             anchors.topMargin: 1
-            color: "transparent"
+            color: item.enabled ? "transparent" : MoneroComponents.Style.inputBoxBackgroundDisabled
         }
 
         Rectangle {
@@ -232,13 +240,18 @@ Item {
             id: input
             anchors.fill: parent
             anchors.leftMargin: inlineIcon.visible ? 44 : 0
+            font.family: item.fontFamily
             font.pixelSize: item.fontSize
             font.bold: item.fontBold
+            KeyNavigation.backtab: item.KeyNavigation.backtab
+            KeyNavigation.tab: item.KeyNavigation.tab
             onEditingFinished: item.editingFinished()
             onAccepted: item.accepted();
             onTextChanged: item.textUpdated()
-            topPadding: 10
-            bottomPadding: 10
+            leftPadding: inputPadding
+            rightPadding: (inlineButtons.width > 0 ? inlineButtons.width + inlineButtons.spacing : 0) + inputPadding
+            topPadding: inputPadding
+            bottomPadding: inputPadding
             echoMode: isPasswordHidden() ? TextInput.Password : TextInput.Normal
 
             MoneroComponents.Label {
@@ -260,13 +273,17 @@ Item {
                     onClicked: passwordToggle()
                 }
             }
-        }
 
-        MoneroComponents.InlineButton {
-            id: inlineButtonId
-            visible: item.inlineButtonText ? true : false
-            anchors.right: parent.right
-            anchors.rightMargin: 8
+            RowLayout {
+                id: inlineButtons
+                anchors.bottom: parent.bottom
+                anchors.top: parent.top
+                anchors.right: parent.right
+                anchors.topMargin: inputPadding
+                anchors.bottomMargin: inputPadding
+                anchors.rightMargin: inputPadding
+                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
@@ -73,6 +75,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,15 +88,12 @@ 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();
 
+    onActiveFocusChanged: activeFocus && input.forceActiveFocus()
+
     spacing: 0
     Rectangle {
         id: inputLabelRect
@@ -159,14 +159,18 @@ 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
@@ -198,18 +202,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/Navbar.qml

@@ -0,0 +1,207 @@
+// 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
+
+    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 {
+            model: items.length
+
+            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
+                        color: items[index].active ? grid.borderColor : "transparent"
+                        height: children[0].height
+                        width: children[0].width
+
+                        MoneroComponents.TextPlain {
+                            anchors.verticalCenter: parent.verticalCenter
+                            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: 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,6 +39,15 @@ 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)

components/PasswordDialog.qml

@@ -44,6 +44,8 @@ Item {
 
     property alias password: passwordInput1.text
     property string walletName
+    property var okButtonText
+    property string okButtonIcon
     property string errorText
     property bool passwordDialogMode
     property bool passphraseDialogMode
@@ -75,10 +77,12 @@ Item {
         appWindow.updateBalance();
     }
 
-    function open(walletName, errorText) {
+    function open(walletName, errorText, okButtonText, okButtonIcon) {
         passwordDialogMode = true;
         passphraseDialogMode = false;
         newPasswordDialogMode = false;
+        root.okButtonText = okButtonText;
+        root.okButtonIcon = okButtonIcon ? okButtonIcon : "";
         _openInit(walletName, errorText);
     }
 
@@ -274,6 +278,7 @@ Item {
 
                 MoneroComponents.StandardButton {
                     id: cancelButton
+                    primary: false
                     small: true
                     text: qsTr("Cancel") + translationManager.emptyString
                     KeyNavigation.tab: passwordInput1
@@ -282,8 +287,10 @@ Item {
 
                 MoneroComponents.StandardButton {
                     id: okButton
+                    fontAwesomeIcon: true
+                    rightIcon: okButtonIcon
                     small: true
-                    text: qsTr("Ok") + translationManager.emptyString
+                    text: okButtonText ? okButtonText : qsTr("Ok") + translationManager.emptyString
                     KeyNavigation.tab: cancelButton
                     enabled: (passwordDialogMode == true) ? true : passwordInput1.text === passwordInput2.text
                     onClicked: onOk()

components/RemoteNodeDialog.qml

@@ -0,0 +1,153 @@
+// 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 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
+    }
+
+    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
+        }
+    }
+
+    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,6 +66,8 @@ GridLayout {
     signal editingFinished()
     signal textChanged()
 
+    onActiveFocusChanged: activeFocus && daemonAddr.forceActiveFocus()
+
     function isValid() {
         return daemonAddr.text.trim().length > 0 && daemonPort.acceptableInput
     }
@@ -92,7 +93,6 @@ GridLayout {
         placeholderColor: root.placeholderColor
         placeholderOpacity: root.placeholderOpacity
         labelFontSize: root.labelFontSize
-        borderColor: lineEditBorderColor
         backgroundColor: lineEditBackgroundColor
         fontColor: lineEditFontColor
         fontBold: lineEditFontBold
@@ -115,7 +115,6 @@ GridLayout {
         placeholderColor: root.placeholderColor
         placeholderOpacity: root.placeholderOpacity
         labelFontSize: root.labelFontSize
-        borderColor: lineEditBorderColor
         backgroundColor: lineEditBackgroundColor
         fontColor: lineEditFontColor
         fontBold: lineEditFontBold

components/StandardButton.qml

@@ -29,10 +29,13 @@
 import QtQuick 2.9
 import QtQuick.Layouts 1.1
 
+import FontAwesome 1.0
+
 import "../components" as MoneroComponents
 
 Item {
     id: button
+    property bool fontAwesomeIcon: false
     property bool primary: true
     property string rightIcon: ""
     property string rightIconInactive: ""
@@ -65,7 +68,7 @@ Item {
         id: buttonRect
         anchors.fill: parent
         radius: 3
-        border.width: parent.focus ? 1 : 0
+        border.width: parent.focus && parent.enabled ? 1 : 0
 
         state: button.enabled ? "active" : "disabled"
         Component.onCompleted: state = state
@@ -73,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
@@ -135,7 +138,7 @@ Item {
         }
 
         Image {
-            visible: button.rightIcon !== ""
+            visible: !fontAwesomeIcon && button.rightIcon !== ""
             Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
             width: button.small ? 16 : 20
             height: button.small ? 16 : 20
@@ -146,6 +149,16 @@ Item {
                 return button.rightIcon;
             }
         }
+
+        Text {
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+            color: MoneroComponents.Style.defaultFontColor
+            font.family: FontAwesome.fontFamilySolid
+            font.pixelSize: button.small ? 16 : 20
+            font.styleName: "Solid"
+            text: button.rightIcon
+            visible: fontAwesomeIcon && button.rightIcon !== ""
+        }
     }
 
     MouseArea {

components/SuccessfulTxDialog.qml

@@ -0,0 +1,167 @@
+// 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 2.0
+import QtQuick.Layouts 1.1
+
+import moneroComponents.Clipboard 1.0
+import "../components" as MoneroComponents
+
+Rectangle {
+    id: root
+    x: parent.width/2 - root.width/2
+    y: parent.height/2 - root.height/2
+    // TODO: implement without hardcoding sizes
+    width: 580
+    height: 400
+    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.rejected()
+    }
+    KeyNavigation.tab: doneButton
+
+    Clipboard { id: clipboard }
+
+    property var transactionID;
+
+    // same signals as Dialog has
+    signal accepted()
+    signal rejected()
+
+    function open(txid) {
+        root.transactionID = txid;
+        root.visible = true;
+    }
+
+    function close() {
+        root.visible = false;
+    }
+
+    ColumnLayout {
+        spacing: 10
+        anchors.fill: parent
+        anchors.margins: 25
+
+        ColumnLayout{
+            Layout.topMargin: 10
+            Layout.leftMargin: 0
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignCenter
+
+            MoneroComponents.Label {
+                fontSize: 18
+                fontFamily: "Arial"
+                horizontalAlignment: Text.AlignHCenter
+                text: {
+                    if (appWindow.viewOnly){
+                        return qsTr("Transaction file successfully saved!") + translationManager.emptyString;
+                    } else {
+                        return  qsTr("Transaction successfully sent!") + translationManager.emptyString;
+                    }
+                }
+            }
+        }
+
+        Image {
+            id: successImage
+            Layout.alignment: Qt.AlignCenter
+            width: 140
+            height: 140
+            source: "qrc:///images/success.png"
+
+            SequentialAnimation{
+                running: successImage.visible
+                ScaleAnimator { target: successImage; from: 0.4; to: 1.3; duration: 125}
+                ScaleAnimator { target: successImage; from: 1.3; to: 1; duration: 80}
+            }
+        }
+
+        MoneroComponents.LineEditMulti {
+            visible: !appWindow.viewOnly
+            Layout.leftMargin: 25
+            Layout.rightMargin: 25
+            borderDisabled: true
+            readOnly: true
+            copyButton: true
+            wrapMode: Text.Wrap
+            labelText: qsTr("Transaction ID:") + translationManager.emptyString
+            text: root.transactionID ? root.transactionID : "";
+            fontSize: 16
+        }
+
+        MoneroComponents.LineEditMulti {
+            visible: appWindow.viewOnly
+            Layout.leftMargin: 25
+            borderDisabled: true
+            readOnly: true
+            wrapMode: Text.Wrap
+            labelText: qsTr("Transaction file location:") + translationManager.emptyString
+            text: walletManager.urlToLocalPath(saveTxDialog.fileUrl)
+            fontSize: 16
+        }
+
+        // open folder / done buttons
+        RowLayout {
+            id: buttons
+            spacing: 70
+            Layout.alignment: Qt.AlignBottom | Qt.AlignHCenter
+            Layout.fillWidth: true
+            Layout.preferredHeight: 50
+
+            MoneroComponents.StandardButton {
+                id: openFolderButton
+                visible: appWindow.viewOnly
+                text: qsTr("Open folder") + translationManager.emptyString;
+                width: 200
+                KeyNavigation.tab: doneButton
+                onClicked: {
+                    oshelper.openContainingFolder(walletManager.urlToLocalPath(saveTxDialog.fileUrl))
+                }
+            }
+
+            MoneroComponents.StandardButton {
+                id: doneButton
+                text: qsTr("Done") + translationManager.emptyString;
+                width: 200
+                focus: root.visible
+                KeyNavigation.tab: openFolderButton
+                onClicked: {
+                    root.close()
+                    root.accepted()
+                }
+            }
+        }
+    }
+}

components/TxConfirmationDialog.qml

@@ -0,0 +1,440 @@
+// 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 ? "<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 {
+                    color: MoneroComponents.Style.defaultFontColor
+                    font.pixelSize: 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"
+                            }
+                        } 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()
+                    }
+                }
+            }
+        }
+    }
+}

components/UpdateDialog.qml

@@ -199,5 +199,6 @@ Popup {
 
     Downloader {
         id: downloader
+        proxyAddress: persistentSettings.getProxyAddress()
     }
 }

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,7 @@
+add_library(quirc STATIC
+    quirc/lib/decode.c
+    quirc/lib/identify.c
+    quirc/lib/quirc.c
+    quirc/lib/version_db.c
+)
+target_include_directories(quirc PUBLIC quirc/lib)

fonts/FontAwesome/FontAwesome.qml

@@ -403,6 +403,7 @@ Object {
     property string inbox : "\uf01c"
     property string indent : "\uf03c"
     property string industry : "\uf275"
+    property string infinity : "\uf534"
     property string info : "\uf129"
     property string infoCircle : "\uf05a"
     property string inr : "\uf156"

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.16.0.3
-
-# 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 -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

installers/windows/Monero.iss

@@ -1,4 +1,4 @@
-; Monero Nitrogen Nebula GUI Wallet Installer for Windows
+; Monero Oxygen Orion GUI Wallet Installer for Windows
 ; Copyright (c) 2017-2020, The Monero Project
 ; See LICENSE
 #define GuiVersion GetFileVersion("bin\monero-wallet-gui.exe")
@@ -167,6 +167,7 @@ Type: files; Name: "{app}\libssp-0.dll"
 Type: files; Name: "{app}\libhidapi-0.dll"
 Type: files; Name: "{app}\libeay32.dll"
 Type: files; Name: "{app}\ssleay32.dll"
+Type: files; Name: "{app}\start-high-dpi.bat"
 Type: files; Name: "{group}\Utilities\x (Check Blockchain Folder).lnk"
 
 

installers/windows/README.md

@@ -6,7 +6,7 @@ Copyright (c) 2017-2020, The Monero Project
 
 This is a *Inno Setup* script `Monero.iss` plus some related files
 that allows you to build a standalone Windows installer (.exe) for
-the GUI wallet that comes with the Nitrogen Nebula release of Monero.
+the GUI wallet that comes with the Oxygen Orion release of Monero.
 
 This turns the GUI wallet into a more or less standard Windows program,
 by default installed into a subdirectory of `C:\Program Files`, a
@@ -18,7 +18,7 @@ Monero.
 As the setup script in file [Monero.iss](Monero.iss) has to list many
 files and directories of the GUI wallet package to install by name,
 this version of the script only works with exactly the GUI wallet
-for Monero release *Nitrogen Nebula* that you find on
+for Monero release *Oxygen Orion* that you find on
 [the official download page](https://getmonero.org/downloads/).
 
 It should however be easy to modify the script for future
@@ -32,15 +32,15 @@ See [LICENSE](LICENSE).
 
 You can only build on Windows, and the result is always a
 Windows .exe file that can act as a standalone installer for the
-Nitrogen Nebula GUI wallet.
+GUI wallet.
 
 Note that the installer build process is now reproducible / deterministic. For details check the file [Deterministic.md](Deterministic.md).
 
 The build steps in detail:
 
 1. Install *Inno Setup*. You can get it from [here](http://www.jrsoftware.org/isdl.php)
-2. Get the Inno Setup script plus related files by cloning the whole [monero-gui GitHub repository](https://github.com/monero-project/monero-gui); you will only need the files in the installer directory `installers\windows` however. Depending on development state, additionally instead of simply using `master` you may have to checkout a specific branch, like `release-v0.16`.
-3. The setup script is written to take the GUI wallet files from a subdirectory named `bin`; so create `installers\windows\bin`, get the zip file of the GUI wallet from [here](https://getmonero.org/downloads/), unpack it somewhere, and copy all the files and subdirectories in the single subdirectory there (currently named `monero-gui-0.16.0.0`) to this `bin` subdirectory
+2. Get the Inno Setup script plus related files by cloning the whole [monero-gui GitHub repository](https://github.com/monero-project/monero-gui); you will only need the files in the installer directory `installers\windows` however. Depending on development state, additionally instead of simply using `master` you may have to checkout a specific branch, like `release-v0.17`.
+3. The setup script is written to take the GUI wallet files from a subdirectory named `bin`; so create `installers\windows\bin`, get the zip file of the GUI wallet from [here](https://getmonero.org/downloads/), unpack it somewhere, and copy all the files and subdirectories in the single subdirectory there (currently named `monero-gui-0.17.0.0`) to this `bin` subdirectory
 4. Start Inno Setup, load `Monero.iss` and compile it
 5. The result i.e. the finished installer will be the file `mysetup.exe` in the `installers\windows\Output` subdirectory 
 

installers/windows/ReadMe.htm

@@ -1,10 +1,10 @@
 <html>
 <head>
-<title>Monero Nitrogen Nebula GUI Wallet</title>
+<title>Monero Oxygen Orion GUI Wallet</title>
 </head>
 
 <body style="font-family: Arial, Helvetica, sans-serif">
-<h1>Monero Nitrogen Nebula GUI Wallet</h1>
+<h1>Monero Oxygen Orion GUI Wallet</h1>
 
   <p>Copyright (c) 2014-2020, The Monero Project</p>
 
@@ -22,7 +22,7 @@
 
 <h2>Content of the Package</h2>
 
-  <p>You just installed the <i>Monero GUI wallet</i> for Windows, release Nitrogen Nebula, version {#GuiVersion}.
+  <p>You just installed the <i>Monero GUI wallet</i> for Windows, release Oxygen Orion, version {#GuiVersion}.
   The wallet enables you to send and receive Moneroj in a secure and very private way.
   </p>
 
@@ -105,8 +105,8 @@
   <p>The Monero software and especially the GUI wallet are "work in progress", and sometimes things go wrong.</p>
 
   <p>Please note that despite any technical problems that you may encounter your Moneroj are almost always safe: You may
-  not be able to move them or you even may not see how many you currently have, but you most probably won't loose any.
-  But do remember that the seed needed to re-create the wallet <b>is</b> critical, however: <b>Never loose your
+  not be able to move them or you even may not see how many you currently have, but you most probably won't lose any.
+  But do remember that the seed needed to re-create the wallet <b>is</b> critical, however: <b>Never lose your
   seed!</b></p>
 
   <p>In the <i>Utilities</i> sub-folder there are several more icons that may help you to solve problems.

ios_get_libwallet.api.sh

@@ -1,49 +0,0 @@
-#!/bin/bash -e
-
-# 3 header files required by monero are missing from the IOS SDK. I copied them from iphoneSimulator SDK
-# cd /Applications/XCode.app
-# sudo cp ./Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/sys/vmmeter.h ./Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sys/
-# sudo cp ./Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/netinet/udp_var.h ./Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/netinet/
-# sudo cp ./Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/netinet/ip_var.h ./Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/netinet/
-
-
-if [ -z $BUILD_TYPE ]; then
-    BUILD_TYPE=release
-fi
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -z $BOOST_LIBRARYDIR ]; then
-    BOOST_LIBRARYDIR=${ROOT_DIR}/../ofxiOSBoost/build/ios/prefix/lib
-fi
-if [ -z $BOOST_INCLUDEDIR ]; then
-    BOOST_INCLUDEDIR=${ROOT_DIR}/../ofxiOSBoost/build/ios/prefix/include
-fi
-if [ -z $OPENSSL_INCLUDE_DIR ]; then
-    OPENSSL_INCLUDE_DIR=${ROOT_DIR}/../openssl/1.0.2j/include
-fi
-if [ -z $OPENSSL_ROOT_DIR ]; then
-    OPENSSL_ROOT_DIR=${ROOT_DIR}/../openssl/1.0.2j
-fi
-
-echo "Building IOS armv7"
-rm -r monero/build > /dev/null
-mkdir -p monero/build/release
-pushd monero/build/release
-cmake -D IOS=ON -D ARCH=armv7 -D BOOST_LIBRARYDIR=${BOOST_INCLUDEDIR} -D BOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -D OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -D OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -D CMAKE_BUILD_TYPE=debug -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="/Users/jacob/crypto/monero-core/monero"  ../..
-make -j4 && make install
-popd
-echo "Building IOS arm64"
-rm -r monero/build > /dev/null
-mkdir -p monero/build/release
-pushd monero/build/release
-cmake -D IOS=ON -D ARCH=armv8-a -D BOOST_LIBRARYDIR=${BOOST_INCLUDEDIR} -D BOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -D OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -D OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -D CMAKE_BUILD_TYPE=debug -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="/Users/jacob/crypto/monero-core/monero"  ../..
-make -j4 && make install
-popd
-
-echo "Creating fat library for armv7 and arm64"
-pushd monero
-mkdir -p lib-ios
-lipo -create lib-armv7/libwallet_merged.a lib-arm64/libwallet_merged.a -output lib-ios/libwallet_merged.a
-lipo -create lib-armv7/libunbound.a lib-arm64/libunbound.a -output lib-ios/libunbound.a
-lipo -create lib-armv7/libepee.a lib-arm64/libepee.a -output lib-ios/libepee.a
-popd

js/Utils.js

@@ -113,5 +113,5 @@ function capitalize(s){
 }
 
 function removeTrailingZeros(value) {
-    return (value + '').replace(/(\.\d*[1-9])0+$/, '$1');
+    return (value + '').replace(/(\.\d*?)0+$/, '$1').replace(/\.$/, '');
 }

js/Wizard.js

@@ -65,7 +65,7 @@ function createWalletPath(isIOS, folder_path,account_name){
     return folder_path + "/" + account_name + "/" + account_name
 }
 
-function walletPathExists(directory, filename, isIOS, walletManager) {
+function walletPathExists(accountsDir, directory, filename, isIOS, walletManager) {
     if(!filename || filename === "") return false;
     if(!directory || directory === "") return false;
 
@@ -76,7 +76,7 @@ function walletPathExists(directory, filename, isIOS, walletManager) {
         directory += "/"
 
     if(isIOS)
-        var path = moneroAccountsDir + filename;
+        var path = accountsDir + filename;
     else
         var path = directory + filename + "/" + filename;
 

lang/languages.xml

@@ -53,7 +53,6 @@ Lojban
         <language display_name="Українська" locale="uk_UA" wallet_language="English" flag="/lang/flags/ua.png" qs="none"/>
         <language display_name="Lietuvių" locale="lt_LT" wallet_language="English" flag="/lang/flags/lt.png" qs="none"/>
         <language display_name="Suomi" locale="fi_FI" wallet_language="English" flag="/lang/flags/fi.png" qs="none"/>
-        <language display_name="Pirate" locale="prt" wallet_language="English" flag="/lang/flags/pirate.png" qs="none"/>
         <language display_name="Български" locale="bg_BG" wallet_language="English" flag="/lang/flags/bg.png" qs="none"/>
         <language display_name="Norwegian" locale="nb_NO" wallet_language="English" flag="/lang/flags/nb_NO.png" qs="none"/>
         <!-- <language display_name="اُردُو" locale="ur_UR" wallet_language="English" flag="/lang/flags/pk.png" qs="none"/> -->

linuxdeploy_helper.sh

@@ -1,62 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $ROOT_DIR/utils.sh
-
-TARGET=$1
-
-GUI_EXEC=$2
-
-platform=$(get_platform)
-
-if [[ "$platform" == "linux64" ]]; then
-    PLAT_DIR="/usr/lib/x86_64-linux-gnu"
-elif [[ "$platform" == "linux32" ]]; then
-    PLAT_DIR="/usr/lib/i386-linux-gnu"
-elif [[ "$platform" == "linuxarmv7" ]]; then
-    PLAT_DIR="/usr/lib/arm-linux-gnueabihf"
-elif [[ "$platform" == "linuxarmv8" ]]; then
-    PLAT_DIR="/usr/lib/aarch64-linux-gnu"
-else
-    PLAT_DIR="/usr/lib"
-fi
-
-if [ -z "$QT_DIR" ]; then
-    QT_DIR=$PLAT_DIR/qt5
-fi
-
-if [ -z "$QTXML_DIR" ]; then
-    QTXML_DIR=$PLAT_DIR
-fi
-
-# Copy dependencies
-EXCLUDE='libstdc++|libgcc_s.so|libc.so|libpthread'
-INCLUDE='libunbound'
-cp -rv $QT_DIR/qml $TARGET || exit
-cp -rv $QT_DIR/plugins $TARGET || exit
-mkdir -p $TARGET/libs || exit
-#ldd $TARGET/$GUI_EXEC | grep "=> /" | awk '{print $3}' | grep $INCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit
-#ldd $TARGET/$GUI_EXEC | grep "=> /" | awk '{print $3}' | grep -Ev $EXCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit
-#ldd $TARGET/plugins/platforms/libqxcb.so| grep "=> /" | awk '{print $3}' | grep -Ev $EXCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit
-#cp -v $QTXML_DIR/libQt5XmlPatterns.so.5 $TARGET/libs || exit
-
-# Create start script
-cat > $TARGET/start-gui.sh <<EOL
-#!/bin/bash
-export LD_LIBRARY_PATH=\`pwd\`/libs
-export QT_PLUGIN_PATH=\`pwd\`/plugins
-export QML2_IMPORT_PATH=\`pwd\`/qml
-# make it so that it can be called from anywhere and also through soft links
-SCRIPT_DIR="\$(dirname "\$(test -L "\${BASH_SOURCE[0]}" && readlink "\${BASH_SOURCE[0]}" || echo "\${BASH_SOURCE[0]}")")"
-"\$SCRIPT_DIR"/$GUI_EXEC "\$@"
-EOL
-
-# Create start script
-cat > $TARGET/start-tails.AppImage <<EOL
-#!/bin/bash
-# Silly hack to provide a launcher that is double clickable
-bash ./start-gui.sh
-EOL
-
-chmod +x $TARGET/start-gui.sh
-chmod +x $TARGET/start-tails.AppImage

main.qml

@@ -26,6 +26,7 @@
 // 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 QtQml.Models 2.12
 import QtQuick 2.9
 import QtQuick.Window 2.0
 import QtQuick.Controls 1.1
@@ -33,6 +34,9 @@ import QtQuick.Controls.Styles 1.1
 import QtQuick.Dialogs 1.2
 import QtGraphicalEffects 1.0
 
+import FontAwesome 1.0
+
+import moneroComponents.Network 1.0
 import moneroComponents.Wallet 1.0
 import moneroComponents.WalletManager 1.0
 import moneroComponents.PendingTransaction 1.0
@@ -50,7 +54,10 @@ import "version.js" as Version
 
 ApplicationWindow {
     id: appWindow
-    title: "Monero" + (walletName ? " - " + walletName : "")
+    title: "Monero" +
+        (persistentSettings.displayWalletNameInTitleBar && walletName
+        ? " - " + walletName
+        : "")
     minimumWidth: 750
     minimumHeight: 450
 
@@ -58,17 +65,17 @@ ApplicationWindow {
     property bool hideBalanceForced: false
     property bool ctrlPressed: false
     property alias persistentSettings : persistentSettings
+    property string accountsDir: !persistentSettings.portable ? moneroAccountsDir : persistentSettings.portableFolderName + "/wallets"
     property var currentWallet;
     property bool disconnected: currentWallet ? currentWallet.disconnected : false
     property var transaction;
-    property var transactionDescription;
     property var walletPassword
     property int restoreHeight:0
     property bool daemonSynced: false
     property bool walletSynced: false
     property int maxWindowHeight: (isAndroid || isIOS)? screenHeight : (screenHeight < 900)? 720 : 800;
     property bool daemonRunning: !persistentSettings.useRemoteNode && !disconnected
-    property bool daemonStartStopInProgress: false
+    property int daemonStartStopInProgress: 0
     property alias toolTip: toolTip
     property string walletName
     property bool viewOnly: false
@@ -137,12 +144,8 @@ ApplicationWindow {
 
         if(seq === "Ctrl+S") middlePanel.state = "Transfer"
         else if(seq === "Ctrl+R") middlePanel.state = "Receive"
-        else if(seq === "Ctrl+K") middlePanel.state = "TxKey"
         else if(seq === "Ctrl+H") middlePanel.state = "History"
         else if(seq === "Ctrl+B") middlePanel.state = "AddressBook"
-        else if(seq === "Ctrl+M") middlePanel.state = "Mining"
-        else if(seq === "Ctrl+I") middlePanel.state = "Sign"
-        else if(seq === "Ctrl+G") middlePanel.state = "SharedRingDB"
         else if(seq === "Ctrl+E") middlePanel.state = "Settings"
         else if(seq === "Ctrl+D") middlePanel.state = "Advanced"
         else if(seq === "Ctrl+T") middlePanel.state = "Account"
@@ -162,11 +165,8 @@ ApplicationWindow {
             else if(middlePanel.state === "Transfer") middlePanel.state = "AddressBook"
             else if(middlePanel.state === "AddressBook") middlePanel.state = "Receive"
             else if(middlePanel.state === "Receive") middlePanel.state = "History"
-            else if(middlePanel.state === "History") middlePanel.state = "Mining"
-            else if(middlePanel.state === "Mining") middlePanel.state = "TxKey"
-            else if(middlePanel.state === "TxKey") middlePanel.state = "SharedRingDB"
-            else if(middlePanel.state === "SharedRingDB") middlePanel.state = "Sign"
-            else if(middlePanel.state === "Sign") middlePanel.state = "Settings"
+            else if(middlePanel.state === "History") middlePanel.state = "Advanced"
+            else if(middlePanel.state === "Advanced") middlePanel.state = "Settings"
         } else if(seq === "Ctrl+Shift+Backtab" || seq === "Alt+Shift+Backtab") {
             /*
             if(middlePanel.state === "Settings") middlePanel.state = "Sign"
@@ -178,11 +178,8 @@ ApplicationWindow {
             else if(middlePanel.state === "TxKey") middlePanel.state = "Receive"
             else if(middlePanel.state === "Receive") middlePanel.state = "Transfer"
             */
-            if(middlePanel.state === "Settings") middlePanel.state = "Sign"
-            else if(middlePanel.state === "Sign") middlePanel.state = "SharedRingDB"
-            else if(middlePanel.state === "SharedRingDB") middlePanel.state = "TxKey"
-            else if(middlePanel.state === "TxKey") middlePanel.state = "Mining"
-            else if(middlePanel.state === "Mining") middlePanel.state = "History"
+            if(middlePanel.state === "Settings") middlePanel.state = "Advanced"
+            else if(middlePanel.state === "Advanced") middlePanel.state = "History"
             else if(middlePanel.state === "History") middlePanel.state = "Receive"
             else if(middlePanel.state === "Receive") middlePanel.state = "AddressBook"
             else if(middlePanel.state === "AddressBook") middlePanel.state = "Transfer"
@@ -230,12 +227,6 @@ ApplicationWindow {
         else
           walletManager.setLogLevel(persistentSettings.logLevel)
 
-        // setup language
-        var locale = persistentSettings.locale
-        if (locale !== "") {
-            translationManager.setLanguage(locale.split("_")[0]);
-        }
-
         // Reload transfer page with translations enabled
         middlePanel.transferView.onPageCompleted();
 
@@ -258,7 +249,7 @@ ApplicationWindow {
         // wallet already opened with wizard, we just need to initialize it
         var wallet_path = persistentSettings.wallet_path;
         if(isIOS)
-            wallet_path = moneroAccountsDir + wallet_path;
+            wallet_path = appWindow.accountsDir + wallet_path;
         // console.log("opening wallet at: ", wallet_path, "with password: ", appWindow.walletPassword);
         console.log("opening wallet at: ", wallet_path, ", network type: ", persistentSettings.nettype == NetworkType.MAINNET ? "mainnet" : persistentSettings.nettype == NetworkType.TESTNET ? "testnet" : "stagenet");
 
@@ -364,6 +355,7 @@ ApplicationWindow {
         currentWallet.deviceButtonPressed.connect(onDeviceButtonPressed);
         currentWallet.walletPassphraseNeeded.connect(onWalletPassphraseNeededWallet);
         currentWallet.transactionCommitted.connect(onTransactionCommitted);
+        currentWallet.proxyAddress = Qt.binding(persistentSettings.getWalletProxyAddress);
         middlePanel.paymentClicked.connect(handlePayment);
         middlePanel.sweepUnmixableClicked.connect(handleSweepUnmixable);
         middlePanel.getProofClicked.connect(handleGetProof);
@@ -373,13 +365,13 @@ ApplicationWindow {
         console.log("Recovering from seed: ", persistentSettings.is_recovering)
         console.log("restore Height", persistentSettings.restore_height)
 
-        // Use saved daemon rpc login settings
-        currentWallet.setDaemonLogin(persistentSettings.daemonUsername, persistentSettings.daemonPassword)
-
-        if(persistentSettings.useRemoteNode)
-            currentDaemonAddress = persistentSettings.remoteNodeAddress
-        else
-            currentDaemonAddress = localDaemonAddress
+        if (persistentSettings.useRemoteNode) {
+            const remoteNode = remoteNodesModel.currentRemoteNode();
+            currentDaemonAddress = remoteNode.address;
+            currentWallet.setDaemonLogin(remoteNode.username, remoteNode.password);
+        } else {
+            currentDaemonAddress = localDaemonAddress;
+        }
 
         console.log("initializing with daemon address: ", currentDaemonAddress)
         currentWallet.initAsync(
@@ -388,13 +380,15 @@ ApplicationWindow {
             0,
             persistentSettings.is_recovering,
             persistentSettings.is_recovering_from_device,
-            persistentSettings.restore_height);
+            persistentSettings.restore_height,
+            persistentSettings.getWalletProxyAddress());
+
         // save wallet keys in case wallet settings have been changed in the init
         currentWallet.setPassword(walletPassword);
     }
 
     function isTrustedDaemon() {
-        return !persistentSettings.useRemoteNode || persistentSettings.is_trusted_daemon;
+        return !persistentSettings.useRemoteNode || remoteNodesModel.currentRemoteNode().trusted;
     }
 
     function usefulName(path) {
@@ -429,6 +423,10 @@ ApplicationWindow {
         leftPanel.minutesToUnlock = (balance !== balanceU) ? currentWallet.history.minutesToUnlock : "";
         leftPanel.balanceString = balance
         leftPanel.balanceUnlockedString = balanceU
+        if (middlePanel.state === "Account") {
+            middlePanel.accountView.balanceAllText = walletManager.displayAmount(appWindow.currentWallet.balanceAll());
+            middlePanel.accountView.unlockedBalanceAllText = walletManager.displayAmount(appWindow.currentWallet.unlockedBalanceAll());
+        }
     }
 
     function onUriHandler(uri){
@@ -492,21 +490,35 @@ ApplicationWindow {
             walletInitialized = true
 
             // check if daemon was already mining and add mining logo if true
-            middlePanel.miningView.update();
+            middlePanel.advancedView.miningView.update();
         }
     }
 
     function onDeviceButtonRequest(code){
-        prevSplashText = splash.messageText;
-        splashDisplayedBeforeButtonRequest = splash.visible;
-        appWindow.showProcessingSplash(qsTr("Please proceed to the device..."));
+        if (txConfirmationPopup.visible) {
+            txConfirmationPopup.bottomTextAnimation.running = true
+            if (!txConfirmationPopup.errorText.visible) {
+                txConfirmationPopup.bottomText.text  = qsTr("Please confirm transaction on the device...") + translationManager.emptyString;
+            } else {
+                txConfirmationPopup.bottomText.text  = qsTr("Please proceed to the device...") + translationManager.emptyString;
+            }
+        } else {
+            prevSplashText = splash.messageText;
+            splashDisplayedBeforeButtonRequest = splash.visible;
+            appWindow.showProcessingSplash(qsTr("Please proceed to the device..."));
+        }
     }
 
     function onDeviceButtonPressed(){
-        if (splashDisplayedBeforeButtonRequest){
-           appWindow.showProcessingSplash(prevSplashText);
+        if (txConfirmationPopup.visible) {
+            txConfirmationPopup.bottomTextAnimation.running = false;
+            txConfirmationPopup.bottomText.text  = qsTr("Signing transaction in the device...") + translationManager.emptyString;
         } else {
-           hideProcessingSplash();
+            if (splashDisplayedBeforeButtonRequest){
+                appWindow.showProcessingSplash(prevSplashText);
+            } else {
+                hideProcessingSplash();
+            }
         }
     }
 
@@ -605,8 +617,17 @@ ApplicationWindow {
 
         const callback = function() {
             persistentSettings.useRemoteNode = true;
-            currentDaemonAddress = persistentSettings.remoteNodeAddress;
-            currentWallet.initAsync(currentDaemonAddress, isTrustedDaemon());
+            const remoteNode = remoteNodesModel.currentRemoteNode();
+            currentDaemonAddress = remoteNode.address;
+            currentWallet.setDaemonLogin(remoteNode.username, remoteNode.password);
+            currentWallet.initAsync(
+                currentDaemonAddress,
+                isTrustedDaemon(),
+                0,
+                false,
+                false,
+                0,
+                persistentSettings.getWalletProxyAddress());
             walletManager.setDaemonAddressAsync(currentDaemonAddress);
         };
 
@@ -624,7 +645,15 @@ ApplicationWindow {
         console.log("disconnecting remote node");
         persistentSettings.useRemoteNode = false;
         currentDaemonAddress = localDaemonAddress
-        currentWallet.initAsync(currentDaemonAddress, isTrustedDaemon());
+        currentWallet.setDaemonLogin("", "");
+        currentWallet.initAsync(
+            currentDaemonAddress,
+            isTrustedDaemon(),
+            0,
+            false,
+            false,
+            0,
+            persistentSettings.getWalletProxyAddress());
         walletManager.setDaemonAddressAsync(currentDaemonAddress);
         firstBlockSeen = 0;
     }
@@ -682,31 +711,33 @@ ApplicationWindow {
     }
 
     function startDaemon(flags){
-        daemonStartStopInProgress = true;
+        daemonStartStopInProgress = 1;
 
         // Pause refresh while starting daemon
         currentWallet.pauseRefresh();
 
-        appWindow.showProcessingSplash(qsTr("Waiting for daemon to start..."))
         const noSync = appWindow.walletMode === 0;
         const bootstrapNodeAddress = persistentSettings.walletMode < 2 ? "auto" : persistentSettings.bootstrapNodeAddress
-        daemonManager.start(flags, persistentSettings.nettype, persistentSettings.blockchainDataDir, bootstrapNodeAddress, noSync);
+        daemonManager.start(flags, persistentSettings.nettype, persistentSettings.blockchainDataDir, bootstrapNodeAddress, noSync, persistentSettings.pruneBlockchain);
     }
 
-    function stopDaemon(callback){
-        daemonStartStopInProgress = true;
-        appWindow.showProcessingSplash(qsTr("Waiting for daemon to stop..."))
+    function stopDaemon(callback, splash){
+        daemonStartStopInProgress = 2;
+        if (splash) {
+            appWindow.showProcessingSplash(qsTr("Waiting for daemon to stop..."));
+        }
         daemonManager.stopAsync(persistentSettings.nettype, function(result) {
-            daemonStartStopInProgress = false;
-            hideProcessingSplash();
+            daemonStartStopInProgress = 0;
+            if (splash) {
+                hideProcessingSplash();
+            }
             callback(result);
         });
     }
 
     function onDaemonStarted(){
         console.log("daemon started");
-        daemonStartStopInProgress = false;
-        hideProcessingSplash();
+        daemonStartStopInProgress = 0;
         currentWallet.connected(true);
         // resume refresh
         currentWallet.startRefresh();
@@ -719,8 +750,7 @@ ApplicationWindow {
 
     function onDaemonStartFailure(error) {
         console.log("daemon start failed");
-        daemonStartStopInProgress = false;
-        hideProcessingSplash();
+        daemonStartStopInProgress = 0;
         // resume refresh
         currentWallet.startRefresh();
         informationPopup.title = qsTr("Daemon failed to start") + translationManager.emptyString;
@@ -777,122 +807,95 @@ ApplicationWindow {
     function walletsFound() {
         if (persistentSettings.wallet_path.length > 0) {
             if(isIOS)
-                return walletManager.walletExists(moneroAccountsDir + persistentSettings.wallet_path);
+                return walletManager.walletExists(appWindow.accountsDir + persistentSettings.wallet_path);
             else
                 return walletManager.walletExists(persistentSettings.wallet_path);
         }
         return false;
     }
 
-    function onTransactionCreated(pendingTransaction,address,paymentId,mixinCount){
+    function onTransactionCreated(pendingTransaction, addresses, paymentId, mixinCount) {
         console.log("Transaction created");
-        hideProcessingSplash();
+        txConfirmationPopup.bottomText.text = "";
         transaction = pendingTransaction;
         // validate address;
         if (transaction.status !== PendingTransaction.Status_Ok) {
             console.error("Can't create transaction: ", transaction.errorString);
-            informationPopup.title = qsTr("Error") + translationManager.emptyString;
-            if (currentWallet.connected() == Wallet.ConnectionStatus_WrongVersion)
-                informationPopup.text  = qsTr("Can't create transaction: Wrong daemon version: ") + transaction.errorString
-            else
-                informationPopup.text  = qsTr("Can't create transaction: ") + transaction.errorString
-            informationPopup.icon  = StandardIcon.Critical
-            informationPopup.onCloseCallback = null
-            informationPopup.open();
+            if (currentWallet.connected() == Wallet.ConnectionStatus_WrongVersion) {
+                txConfirmationPopup.errorText.text  = qsTr("Can't create transaction: Wrong daemon version: ") + transaction.errorString
+            } else {
+                txConfirmationPopup.errorText.text  = qsTr("Can't create transaction: ") + transaction.errorString
+            }
             // deleting transaction object, we don't want memleaks
             currentWallet.disposeTransaction(transaction);
 
         } else if (transaction.txCount == 0) {
-            informationPopup.title = qsTr("Error") + translationManager.emptyString
-            informationPopup.text  = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
-            informationPopup.icon = StandardIcon.Information
-            informationPopup.onCloseCallback = null
-            informationPopup.open()
+            console.error("Can't create transaction: ", transaction.errorString);
+            txConfirmationPopup.errorText.text   = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
             // deleting transaction object, we don't want memleaks
             currentWallet.disposeTransaction(transaction);
         } else {
             console.log("Transaction created, amount: " + walletManager.displayAmount(transaction.amount)
                     + ", fee: " + walletManager.displayAmount(transaction.fee));
 
-            // here we show confirmation popup;
-            transactionConfirmationPopup.title = qsTr("Please confirm transaction:\n") + translationManager.emptyString;
-            transactionConfirmationPopup.text = "";
-            transactionConfirmationPopup.text += (address === "" ? "" : (qsTr("Address: ") + address));
-            transactionConfirmationPopup.text += (paymentId === "" ? "" : (qsTr("\nPayment ID: ") + paymentId));
-            transactionConfirmationPopup.text +=  qsTr("\n\nAmount: ") + walletManager.displayAmount(transaction.amount);
-            transactionConfirmationPopup.text +=  qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee);
-            transactionConfirmationPopup.text +=  qsTr("\nRingsize: ") + (mixinCount + 1);
-            transactionConfirmationPopup.text +=  qsTr("\n\nNumber of transactions: ") + transaction.txCount
-            transactionConfirmationPopup.text +=  (transactionDescription === "" ? "" : (qsTr("\nDescription: ") + transactionDescription))
-            for (var i = 0; i < transaction.subaddrIndices.length; ++i){
-                transactionConfirmationPopup.text += qsTr("\nSpending address index: ") + transaction.subaddrIndices[i];
-            }
-
-            transactionConfirmationPopup.text += translationManager.emptyString;
-            transactionConfirmationPopup.icon = StandardIcon.Question
-            transactionConfirmationPopup.open()
+            // here we update txConfirmationPopup
+            txConfirmationPopup.transactionAmount = Utils.removeTrailingZeros(walletManager.displayAmount(transaction.amount));
+            txConfirmationPopup.transactionFee = Utils.removeTrailingZeros(walletManager.displayAmount(transaction.fee));
+            txConfirmationPopup.confirmButton.text = viewOnly ? qsTr("Save as file") : qsTr("Confirm") + translationManager.emptyString;
+            txConfirmationPopup.confirmButton.rightIcon = viewOnly ? "" : "qrc:///images/rightArrow.png"
         }
     }
 
+    function getDisplayAmountTotal(recipients) {
+        const amounts = recipients.map(function (recipient) {
+            return recipient.amount;
+        });
+        const total = walletManager.amountsSumFromStrings(amounts);
+        return Utils.removeTrailingZeros(walletManager.displayAmount(total));
+    }
 
     // called on "transfer"
-    function handlePayment(address, paymentId, amount, mixinCount, priority, description, createFile) {
+    function handlePayment(recipients, paymentId, mixinCount, priority, description, createFile) {
         console.log("Creating transaction: ")
-        console.log("\taddress: ", address,
+        console.log("\trecipients: ", recipients,
                     ", payment_id: ", paymentId,
-                    ", amount: ", amount,
                     ", mixins: ", mixinCount,
                     ", priority: ", priority,
                     ", description: ", description);
 
-        var splashMsg = qsTr("Creating transaction...");
-        splashMsg += appWindow.currentWallet.isLedger() ? qsTr("\n\nPlease check your hardware wallet –\nyour input may be required.") : "";
-        showProcessingSplash(splashMsg);
-
-        transactionDescription = description;
-
-        // validate amount;
-        if (amount !== "(all)") {
-            var amountxmr = walletManager.amountFromString(amount);
-            console.log("integer amount: ", amountxmr);
-            console.log("integer unlocked", currentWallet.unlockedBalance())
-            if (amountxmr <= 0) {
-                hideProcessingSplash()
-                informationPopup.title = qsTr("Error") + translationManager.emptyString;
-                informationPopup.text  = qsTr("Amount is wrong: expected number from %1 to %2")
-                        .arg(walletManager.displayAmount(0))
-                        .arg(walletManager.displayAmount(currentWallet.unlockedBalance()))
-                        + translationManager.emptyString
-
-                informationPopup.icon  = StandardIcon.Critical
-                informationPopup.onCloseCallback = null
-                informationPopup.open()
-                return;
-            } else if (amountxmr > currentWallet.unlockedBalance()) {
-                hideProcessingSplash()
-                informationPopup.title = qsTr("Error") + translationManager.emptyString;
-                informationPopup.text  = qsTr("Insufficient funds. Unlocked balance: %1")
-                        .arg(walletManager.displayAmount(currentWallet.unlockedBalance()))
-                        + translationManager.emptyString
-
-                informationPopup.icon  = StandardIcon.Critical
-                informationPopup.onCloseCallback = null
-                informationPopup.open()
-                return;
-            }
+        const recipientAll = recipients.find(function (recipient) {
+            return recipient.amount == "(all)";
+        });
+        if (recipientAll && recipients.length > 1) {
+            throw "Sending all requires one destination address";
         }
 
-        if (amount === "(all)")
-            currentWallet.createTransactionAllAsync(address, paymentId, mixinCount, priority);
-        else
-            currentWallet.createTransactionAsync(address, paymentId, amountxmr, mixinCount, priority);
+        txConfirmationPopup.bottomTextAnimation.running = false;
+        txConfirmationPopup.bottomText.text  = qsTr("Creating transaction...") + translationManager.emptyString;
+        txConfirmationPopup.recipients = recipients;
+        txConfirmationPopup.transactionAmount = recipientAll ? "(all)" : getDisplayAmountTotal(recipients);
+        txConfirmationPopup.transactionPriority = priority;
+        txConfirmationPopup.transactionDescription = description;
+        txConfirmationPopup.open();
+
+        if (recipientAll) {
+            currentWallet.createTransactionAllAsync(recipientAll.address, paymentId, mixinCount, priority);
+        } else {
+            const addresses = recipients.map(function (recipient) {
+                return recipient.address;
+            });
+            const amountsxmr = recipients.map(function (recipient) {
+                return recipient.amount;
+            });
+            currentWallet.createTransactionAsync(addresses, paymentId, amountsxmr, mixinCount, priority);
+        }
     }
 
     //Choose where to save transaction
     FileDialog {
         id: saveTxDialog
         title: "Please choose a location"
-        folder: "file://" +moneroAccountsDir
+        folder: "file://" + appWindow.accountsDir
         selectExisting: false;
 
         onAccepted: {
@@ -909,40 +912,27 @@ ApplicationWindow {
     function handleSweepUnmixable() {
         console.log("Creating transaction: ")
 
+        txConfirmationPopup.sweepUnmixable = true;
         transaction = currentWallet.createSweepUnmixableTransaction();
         if (transaction.status !== PendingTransaction.Status_Ok) {
             console.error("Can't create transaction: ", transaction.errorString);
-            informationPopup.title = qsTr("Error") + translationManager.emptyString;
-            informationPopup.text  = qsTr("Can't create transaction: ") + transaction.errorString
-            informationPopup.icon  = StandardIcon.Critical
-            informationPopup.onCloseCallback = null
-            informationPopup.open();
+            txConfirmationPopup.errorText.text  = qsTr("Can't create transaction: ") + transaction.errorString + translationManager.emptyString
             // deleting transaction object, we don't want memleaks
             currentWallet.disposeTransaction(transaction);
 
         } else if (transaction.txCount == 0) {
-            informationPopup.title = qsTr("Error") + translationManager.emptyString
-            informationPopup.text  = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
-            informationPopup.icon = StandardIcon.Information
-            informationPopup.onCloseCallback = null
-            informationPopup.open()
+            console.error("No unmixable outputs to sweep");
+            txConfirmationPopup.errorText.text  = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
             // deleting transaction object, we don't want memleaks
             currentWallet.disposeTransaction(transaction);
         } else {
             console.log("Transaction created, amount: " + walletManager.displayAmount(transaction.amount)
                     + ", fee: " + walletManager.displayAmount(transaction.fee));
-
-            // here we show confirmation popup;
-
-            transactionConfirmationPopup.title = qsTr("Confirmation") + translationManager.emptyString
-            transactionConfirmationPopup.text  = qsTr("Please confirm transaction:\n")
-                        + qsTr("\n\nAmount: ") + walletManager.displayAmount(transaction.amount)
-                        + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee)
-                        + translationManager.emptyString
-            transactionConfirmationPopup.icon = StandardIcon.Question
-            transactionConfirmationPopup.open()
+            txConfirmationPopup.transactionAmount = Utils.removeTrailingZeros(walletManager.displayAmount(transaction.amount));
+            txConfirmationPopup.transactionFee = Utils.removeTrailingZeros(walletManager.displayAmount(transaction.fee));
             // committing transaction
         }
+        txConfirmationPopup.open();
     }
 
     // called after user confirms transaction
@@ -960,7 +950,6 @@ ApplicationWindow {
             // Store to file
             transaction.setFilename(path);
         }
-
         appWindow.showProcessingSplash(qsTr("Sending transaction ..."));
         currentWallet.commitTransactionAsync(transaction);
     }
@@ -972,27 +961,19 @@ ApplicationWindow {
             informationPopup.title = qsTr("Error") + translationManager.emptyString
             informationPopup.text  = qsTr("Couldn't send the money: ") + transaction.errorString
             informationPopup.icon  = StandardIcon.Critical
+            informationPopup.onCloseCallback = null;
+            informationPopup.open();
         } else {
-            var txid_text = ""
-            informationPopup.title = qsTr("Information") + translationManager.emptyString
-            for (var i = 0; i < txid.length; ++i) {
-                if (txid_text.length > 0)
-                    txid_text += ", "
-                txid_text += txid[i]
-            }
-            informationPopup.text  = (viewOnly)? qsTr("Transaction saved to file: %1").arg(path) : qsTr("Monero sent successfully: %1 transaction(s) ").arg(txid.length) + txid_text + translationManager.emptyString
-            informationPopup.icon  = StandardIcon.Information
-            if (transactionDescription.length > 0) {
+            if (txConfirmationPopup.transactionDescription.length > 0) {
                 for (var i = 0; i < txid.length; ++i)
-                  currentWallet.setUserNote(txid[i], transactionDescription);
+                    currentWallet.setUserNote(txid[i], txConfirmationPopup.transactionDescription);
             }
 
             // Clear tx fields
             middlePanel.transferView.clearFields()
-
+            txConfirmationPopup.clearFields()
+            successfulTxPopup.open(txid)
         }
-        informationPopup.onCloseCallback = null
-        informationPopup.open()
         currentWallet.refresh()
         currentWallet.disposeTransaction(transaction)
         currentWallet.storeAsync(function(success) {
@@ -1140,11 +1121,14 @@ ApplicationWindow {
 
     objectName: "appWindow"
     visible: true
-    width: screenWidth > 980 ? 980 : 800
-    height: screenHeight > maxWindowHeight ? maxWindowHeight : 700
+    width: Screen.desktopAvailableWidth > 980
+        ? 980
+        : Math.min(Screen.desktopAvailableWidth, 800)
+    height: Screen.desktopAvailableHeight > maxWindowHeight
+        ? maxWindowHeight
+        : Math.min(Screen.desktopAvailableHeight, 700)
     color: MoneroComponents.Style.appWindowBackgroundColor
     flags: persistentSettings.customDecorations ? Windows.flagsCustomDecorations : Windows.flags
-    onWidthChanged: x -= 0
 
     Timer {
         id: fiatPriceTimer
@@ -1167,7 +1151,7 @@ ApplicationWindow {
             }
 
             var key = currency === "xmreur" ? "XXMRZEUR" : "XXMRZUSD";
-            var ticker = resp.result[key]["o"];
+            var ticker = resp.result[key]["c"][0];
             return ticker;
         } else if(url.startsWith("https://api.coingecko.com/api/v3/")){
             var key = currency === "xmreur" ? "eur" : "usd";
@@ -1255,7 +1239,7 @@ ApplicationWindow {
         }
 
         var url = provider[userCurrency];
-        Network.getJSON(url, fiatApiJsonReceived);
+        network.getJSON(url, fiatApiJsonReceived);
     }
 
     function fiatApiCurrencySymbol() {
@@ -1273,7 +1257,7 @@ ApplicationWindow {
     function fiatApiConvertToFiat(amount) {
         var ticker = persistentSettings.fiatPriceCurrency === "xmrusd" ? appWindow.fiatPriceXMRUSD : appWindow.fiatPriceXMREUR;
         if(ticker <= 0){
-            console.log(fiatApiError("Invalid ticker value: " + ticker));
+            fiatApiError("Invalid ticker value: " + ticker);
             return "?.??";
         }
         return (amount * ticker).toFixed(2);
@@ -1301,8 +1285,10 @@ ApplicationWindow {
     }
 
     Component.onCompleted: {
-        x = (Screen.width - width) / 2
-        y = (Screen.height - maxWindowHeight) / 2
+        x = (Screen.desktopAvailableWidth - width) / 2;
+        y = (Screen.desktopAvailableHeight - height) / 2;
+
+        translationManager.setLanguage(persistentSettings.locale.split("_")[0]);
 
         applyWalletMode(persistentSettings.walletMode);
 
@@ -1341,6 +1327,7 @@ ApplicationWindow {
         } else {
             wizard.wizardState = "wizardHome";
             rootItem.state = "normal"
+            logger.resetLogFilePath(persistentSettings.portable);
             openWallet("wizard");
         }
 
@@ -1348,6 +1335,27 @@ ApplicationWindow {
             appWindow.fiatApiRefresh();
             appWindow.fiatTimerStart();
         }
+
+        if (persistentSettings.askDesktopShortcut && !persistentSettings.portable) {
+            persistentSettings.askDesktopShortcut = false;
+
+            if (isTails) {
+                oshelper.createDesktopEntry();
+            } else if (isLinux) {
+                confirmationDialog.title = qsTr("Desktop entry") + translationManager.emptyString;
+                confirmationDialog.text  = qsTr("Would you like to register Monero GUI Desktop entry?") + translationManager.emptyString;
+                confirmationDialog.icon = StandardIcon.Question;
+                confirmationDialog.cancelText = qsTr("No") + translationManager.emptyString;
+                confirmationDialog.okText = qsTr("Yes") + translationManager.emptyString;
+                confirmationDialog.onAcceptedCallback = function() {
+                    oshelper.createDesktopEntry();
+                };
+                confirmationDialog.onRejectedCallback = null;
+                confirmationDialog.open();
+            }
+        }
+
+        remoteNodesModel.initialize();
     }
 
     MoneroSettings {
@@ -1358,35 +1366,49 @@ ApplicationWindow {
             return "";
         }
 
-        property string language
-        property string locale
+        property bool askDesktopShortcut: isLinux
+        property string language: 'English (US)'
+        property string language_wallet: 'English'
+        property string locale: 'en_US'
         property string account_name
         property string wallet_path
         property bool   allow_background_mining : false
         property bool   miningIgnoreBattery : true
         property var    nettype: NetworkType.MAINNET
         property int    restore_height : 0
-        property bool   is_trusted_daemon : false
+        property bool   is_trusted_daemon : false  // TODO: drop after v0.17.2.0 release
         property bool   is_recovering : false
         property bool   is_recovering_from_device : false
         property bool   customDecorations : true
         property string daemonFlags
         property int logLevel: 0
         property string logCategories: ""
-        property string daemonUsername: ""
-        property string daemonPassword: ""
+        property string daemonUsername: "" // TODO: drop after v0.17.2.0 release
+        property string daemonPassword: "" // TODO: drop after v0.17.2.0 release
         property bool transferShowAdvanced: false
         property bool receiveShowAdvanced: false
         property bool historyShowAdvanced: false
         property bool historyHumanDates: true
         property string blockchainDataDir: ""
         property bool useRemoteNode: false
-        property string remoteNodeAddress: ""
+        property string remoteNodeAddress: "" // TODO: drop after v0.17.2.0 release
+        property string remoteNodesSerialized: JSON.stringify({
+                selected: 0,
+                nodes: remoteNodeAddress != ""
+                    ? [{
+                        address: remoteNodeAddress,
+                        username: daemonUsername,
+                        password: daemonPassword,
+                        trusted: is_trusted_daemon,
+                    }]
+                    : [],
+            })
         property string bootstrapNodeAddress: ""
         property bool segregatePreForkOutputs: true
         property bool keyReuseMitigation2: true
         property int segregationHeight: 0
         property int kdfRounds: 1
+        property bool displayWalletNameInTitleBar: true
         property bool hideBalance: false
         property bool askPasswordBeforeSending: true
         property bool lockOnUserInActivity: true
@@ -1396,17 +1418,119 @@ ApplicationWindow {
         property bool checkForUpdates: true
         property bool autosave: true
         property int autosaveMinutes: 10
+        property bool pruneBlockchain: false
 
         property bool fiatPriceEnabled: false
         property bool fiatPriceToggle: false
         property string fiatPriceProvider: "kraken"
         property string fiatPriceCurrency: "xmrusd"
 
+        property string proxyAddress: "127.0.0.1:9050"
+        property bool proxyEnabled: isTails
+        function getProxyAddress() {
+            if ((socksProxyFlagSet && socksProxyFlag == "") || !proxyEnabled) {
+                return "";
+            }
+            var proxyAddressSetOrForced = socksProxyFlagSet ? socksProxyFlag : proxyAddress;
+            if (proxyAddressSetOrForced == "") {
+                return "127.0.0.1:0";
+            }
+            return proxyAddressSetOrForced;
+        }
+        function getWalletProxyAddress() {
+            if (!useRemoteNode) {
+                return "";
+            }
+            return getProxyAddress();
+        }
+
         Component.onCompleted: {
             MoneroComponents.Style.blackTheme = persistentSettings.blackTheme
         }
     }
 
+    ListModel {
+        id: remoteNodesModel
+
+        property int selected: 0
+
+        signal store()
+
+        function initialize() {
+            try {
+                const remoteNodes = JSON.parse(persistentSettings.remoteNodesSerialized);
+                for (var index = 0; index < remoteNodes.nodes.length; ++index) {
+                    const remoteNode = remoteNodes.nodes[index];
+                    remoteNodesModel.append(remoteNode);
+                }
+                selected = remoteNodes.selected % remoteNodesModel.count || 0;
+            } catch (e) {
+                console.error('failed to parse remoteNodesSerialized', e);
+            }
+
+            store.connect(function() {
+                var remoteNodes = [];
+                for (var index = 0; index < remoteNodesModel.count; ++index) {
+                    remoteNodes.push(remoteNodesModel.get(index));
+                }
+                persistentSettings.remoteNodesSerialized = JSON.stringify({
+                    selected: selected,
+                    nodes: remoteNodes
+                });
+            });
+        }
+
+        function appendIfNotExists(newRemoteNode) {
+            for (var index = 0; index < remoteNodesModel.count; ++index) {
+                const remoteNode = remoteNodesModel.get(index);
+                if (remoteNode.address == newRemoteNode.address &&
+                    remoteNode.username == newRemoteNode.username &&
+                    remoteNode.password == newRemoteNode.password &&
+                    remoteNode.trusted == newRemoteNode.trusted) {
+                        return index;
+                }
+            }
+            remoteNodesModel.append(newRemoteNode);
+            return remoteNodesModel.count - 1;
+        }
+
+        function applyRemoteNode(index) {
+            selected = index;
+            const remoteNode = currentRemoteNode();
+            persistentSettings.useRemoteNode = true;
+            if (currentWallet) {
+                currentWallet.setDaemonLogin(remoteNode.username, remoteNode.password);
+                currentWallet.setTrustedDaemon(remoteNode.trusted);
+                appWindow.connectRemoteNode();
+            }
+        }
+
+        function currentRemoteNode() {
+            if (selected < remoteNodesModel.count) {
+                return remoteNodesModel.get(selected);
+            }
+            return {
+                address: "",
+                username: "",
+                password: "",
+                trusted: false,
+            };
+        }
+
+        function removeSelectNextIfNeeded(index) {
+            remoteNodesModel.remove(index);
+            if (selected == index) {
+                applyRemoteNode(selected % remoteNodesModel.count || 0);
+            } else if (selected > index) {
+                selected = selected - 1;
+            }
+        }
+
+        onCountChanged: store()
+        onDataChanged: store()
+        onSelectedChanged: store()
+    }
+
     // Information dialog
     StandardDialog {
         // dynamically change onclose handler
@@ -1422,10 +1546,11 @@ ApplicationWindow {
         }
     }
 
-    // Confrirmation aka question dialog
-    StandardDialog {
+    // Transaction confirmation popup
+    TxConfirmationDialog {
+        // dynamically change onclose handler
+        id: txConfirmationPopup
         z: parent.z + 1
-        id: transactionConfirmationPopup
         onAccepted: {
             var handleAccepted = function() {
                 // Save transaction to file if view only wallet
@@ -1447,11 +1572,21 @@ ApplicationWindow {
             if(!persistentSettings.askPasswordBeforeSending) {
                 handleAccepted()
             } else {
-                passwordDialog.open()  
+                passwordDialog.open(
+                    "",
+                    "",
+                    (appWindow.viewOnly ? qsTr("Save transaction file") : qsTr("Send transaction")) + translationManager.emptyString,
+                    appWindow.viewOnly ? "" : FontAwesome.arrowCircleRight);
             }
         }
     }
 
+    // Transaction successfully sent popup
+    SuccessfulTxDialog {
+        id: successfulTxPopup
+        z: parent.z + 1
+    }
+
     StandardDialog {
         z: parent.z + 1
         id: confirmationDialog
@@ -1476,6 +1611,10 @@ ApplicationWindow {
         y: (parent.height - height) / 2
     }
 
+    MoneroComponents.RemoteNodeDialog {
+        id: remoteNodeDialog
+    }
+
     // Choose blockchain folder
     FileDialog {
         id: blockchainFileDialog
@@ -1647,18 +1786,6 @@ ApplicationWindow {
                     updateBalance();
                 }
 
-                onTxkeyClicked: {
-                    middlePanel.state = "TxKey";
-                    middlePanel.flickable.contentY = 0;
-                    updateBalance();
-                }
-
-                onSharedringdbClicked: {
-                    middlePanel.state = "SharedRingDB";
-                    middlePanel.flickable.contentY = 0;
-                    updateBalance();
-                }
-
                 onHistoryClicked: {
                     middlePanel.state = "History";
                     middlePanel.flickable.contentY = 0;
@@ -1671,14 +1798,8 @@ ApplicationWindow {
                     updateBalance();
                 }
 
-                onMiningClicked: {
-                    middlePanel.state = "Mining";
-                    middlePanel.flickable.contentY = 0;
-                    updateBalance();
-                }
-
-                onSignClicked: {
-                    middlePanel.state = "Sign";
+                onAdvancedClicked: {
+                    middlePanel.state = "Advanced";
                     middlePanel.flickable.contentY = 0;
                     updateBalance();
                 }
@@ -1721,7 +1842,9 @@ ApplicationWindow {
             anchors.fill: blurredArea
             source: blurredArea
             radius: 64
-            visible: passwordDialog.visible || inputDialog.visible || splash.visible || updateDialog.visible || devicePassphraseDialog.visible
+            visible: passwordDialog.visible || inputDialog.visible || splash.visible || updateDialog.visible ||
+                devicePassphraseDialog.visible || txConfirmationPopup.visible || successfulTxPopup.visible ||
+                remoteNodeDialog.visible
         }
 
 
@@ -1774,7 +1897,7 @@ ApplicationWindow {
         TitleBar {
             id: titleBar
             visible: persistentSettings.customDecorations && middlePanel.state !== "Merchant"
-            walletName: appWindow.walletName
+            walletName: persistentSettings.displayWalletNameInTitleBar ? appWindow.walletName : ""
             anchors.left: parent.left
             anchors.right: parent.right
             onCloseClicked: appWindow.close();
@@ -1827,11 +1950,6 @@ ApplicationWindow {
     function toggleLanguageView(){
         languageSidebar.isOpened ? languageSidebar.close() : languageSidebar.open();
         resetLanguageFields()
-        // update after changing language from settings page
-        if (persistentSettings.language != wizard.language_language) {
-            persistentSettings.language = wizard.language_language
-            persistentSettings.locale   = wizard.language_locale
-        }
     }
 
     Timer {
@@ -1840,7 +1958,7 @@ ApplicationWindow {
         repeat: true
         running: persistentSettings.autosave
         onTriggered: {
-            if (currentWallet) {
+            if (currentWallet && !currentWallet.refreshing) {
                 currentWallet.storeAsync(function(success) {
                     if (success) {
                         appWindow.showStatusMessage(qsTr("Autosaved the wallet"), 3);
@@ -1906,12 +2024,13 @@ ApplicationWindow {
             return;
         }
 
+        const simpleModeFlags = "--enable-dns-blocklist --out-peers 16";
         if (appWindow.daemonRunning) {
             appWindow.stopDaemon(function() {
-                appWindow.startDaemon("")
+                appWindow.startDaemon(simpleModeFlags)
             });
         } else {
-            appWindow.startDaemon("");
+            appWindow.startDaemon(simpleModeFlags);
         }
     }
 
@@ -1919,7 +2038,7 @@ ApplicationWindow {
         // Simple mode connection check timer
         id: simpleModeConnectionTimer
         interval: 2000
-        running: appWindow.walletMode < 2 && currentWallet != undefined && !daemonStartStopInProgress
+        running: appWindow.walletMode < 2 && currentWallet != undefined && daemonStartStopInProgress == 0
         repeat: true
         onTriggered: appWindow.checkSimpleModeConnection()
     }
@@ -1997,7 +2116,7 @@ ApplicationWindow {
         if(daemonManager == undefined || persistentSettings.useRemoteNode) {
             closeAccepted();
         } else if (appWindow.walletMode == 0) {
-            stopDaemon(closeAccepted);
+            stopDaemon(closeAccepted, true);
         } else {
             showProcessingSplash(qsTr("Checking local node status..."));
             const handler = function(running) {
@@ -2115,6 +2234,7 @@ ApplicationWindow {
 
         passwordDialog.onRejectedCallback = function() { appWindow.showWizard(); }
         if (inputDialogVisible) inputDialog.close()
+        remoteNodeDialog.close();
         passwordDialog.open();
     }
 
@@ -2237,7 +2357,13 @@ ApplicationWindow {
         dragMargin: 0
     }
 
+    Network {
+        id: network
+        proxyAddress: persistentSettings.getProxyAddress()
+    }
+
     WalletManager {
         id: walletManager
+        proxyAddress: persistentSettings.getProxyAddress()
     }
 }

monero-wallet-gui.pro

@@ -1,581 +0,0 @@
-# qml components require at least QT 5.9.7
-lessThan (QT_MAJOR_VERSION, 5) | lessThan (QT_MINOR_VERSION, 9) {
-  error("Can't build with Qt $${QT_VERSION}. Use at least Qt 5.9.7")
-}
-
-TEMPLATE = app
-
-QT += svg qml gui-private quick widgets
-
-WALLET_ROOT=$$PWD/monero
-
-CONFIG += c++11 link_pkgconfig
-packagesExist(libusb-1.0) {
-    PKGCONFIG += libusb-1.0
-}
-packagesExist(hidapi-libusb) {
-    PKGCONFIG += hidapi-libusb
-}
-
-GCC_VERSION = $$system("g++ -dumpversion")
-GCC_VERSION = $$split(GCC_VERSION, .)
-GCC_VERSION_MAJOR = $$member(GCC_VERSION, 0)
-GCC_VERSION_MINOR = $$member(GCC_VERSION, 1)
-greaterThan(GCC_VERSION_MAJOR, 9) | if(equals(GCC_VERSION_MAJOR, 9) : greaterThan(GCC_VERSION_MINOR, 0)) {
-    GCC_9_1_OR_GREATER = TRUE
-}
-
-!win32 | !isEmpty(GCC_9_1_OR_GREATER) {
-    QMAKE_CXXFLAGS += -fPIC -fstack-protector -fstack-protector-strong
-    QMAKE_LFLAGS += -fstack-protector -fstack-protector-strong
-}
-
-!win32 {
-    packagesExist(protobuf) {
-        PKGCONFIG += protobuf
-    }
-}
-
-# cleaning "auto-generated" bitmonero directory on "make distclean"
-QMAKE_DISTCLEAN += -r $$WALLET_ROOT
-
-INCLUDEPATH +=  $$WALLET_ROOT/include \
-                $$PWD/src/libwalletqt \
-                $$PWD/src/QR-Code-generator \
-                $$PWD/src \
-                $$WALLET_ROOT/src \
-                $$WALLET_ROOT/external/easylogging++ \
-                $$WALLET_ROOT/contrib/epee/include
-
-HEADERS += \
-    src/main/filter.h \
-    src/main/clipboardAdapter.h \
-    src/main/oscursor.h \
-    src/libwalletqt/WalletManager.h \
-    src/libwalletqt/Wallet.h \
-    src/libwalletqt/PassphraseHelper.h \
-    src/libwalletqt/PendingTransaction.h \
-    src/libwalletqt/TransactionHistory.h \
-    src/libwalletqt/TransactionInfo.h \
-    src/libwalletqt/QRCodeImageProvider.h \
-    src/libwalletqt/Transfer.h \
-    src/NetworkType.h \
-    src/main/oshelper.h \
-    src/TranslationManager.h \
-    src/model/TransactionHistoryModel.h \
-    src/model/TransactionHistorySortFilterModel.h \
-    src/QR-Code-generator/BitBuffer.hpp \
-    src/QR-Code-generator/QrCode.hpp \
-    src/QR-Code-generator/QrSegment.hpp \
-    src/model/AddressBookModel.h \
-    src/libwalletqt/AddressBook.h \
-    src/model/SubaddressModel.h \
-    src/libwalletqt/Subaddress.h \
-    src/model/SubaddressAccountModel.h \
-    src/libwalletqt/SubaddressAccount.h \
-    src/zxcvbn-c/zxcvbn.h \
-    src/libwalletqt/UnsignedTransaction.h \
-    src/main/Logger.h \
-    src/main/MainApp.h \
-    src/qt/downloader.h \
-    src/qt/FutureScheduler.h \
-    src/qt/ipc.h \
-    src/qt/KeysFiles.h \
-    src/qt/network.h \
-    src/qt/utils.h \
-    src/qt/macoshelper.h \
-    src/qt/MoneroSettings.h \
-    src/qt/TailsOS.h
-
-SOURCES += src/main/main.cpp \
-    src/main/filter.cpp \
-    src/main/clipboardAdapter.cpp \
-    src/main/oscursor.cpp \
-    src/libwalletqt/WalletManager.cpp \
-    src/libwalletqt/WalletListenerImpl.cpp \
-    src/libwalletqt/Wallet.cpp \
-    src/libwalletqt/PassphraseHelper.cpp \
-    src/libwalletqt/PendingTransaction.cpp \
-    src/libwalletqt/TransactionHistory.cpp \
-    src/libwalletqt/TransactionInfo.cpp \
-    src/libwalletqt/QRCodeImageProvider.cpp \
-    src/main/oshelper.cpp \
-    src/openpgp/openpgp.cpp \
-    src/TranslationManager.cpp \
-    src/model/TransactionHistoryModel.cpp \
-    src/model/TransactionHistorySortFilterModel.cpp \
-    src/QR-Code-generator/BitBuffer.cpp \
-    src/QR-Code-generator/QrCode.cpp \
-    src/QR-Code-generator/QrSegment.cpp \
-    src/model/AddressBookModel.cpp \
-    src/libwalletqt/AddressBook.cpp \
-    src/model/SubaddressModel.cpp \
-    src/libwalletqt/Subaddress.cpp \
-    src/model/SubaddressAccountModel.cpp \
-    src/libwalletqt/SubaddressAccount.cpp \
-    src/zxcvbn-c/zxcvbn.c \
-    src/libwalletqt/UnsignedTransaction.cpp \
-    src/main/Logger.cpp \
-    src/main/MainApp.cpp \
-    src/qt/downloader.cpp \
-    src/qt/FutureScheduler.cpp \
-    src/qt/ipc.cpp \
-    src/qt/KeysFiles.cpp \
-    src/qt/network.cpp \
-    src/qt/updater.cpp \
-    src/qt/utils.cpp \
-    src/qt/MoneroSettings.cpp \
-    src/qt/TailsOS.cpp
-
-CONFIG(DISABLE_PASS_STRENGTH_METER) {
-    HEADERS -= src/zxcvbn-c/zxcvbn.h
-    SOURCES -= src/zxcvbn-c/zxcvbn.c
-    DEFINES += "DISABLE_PASS_STRENGTH_METER"
-}
-
-!ios {
-    HEADERS += src/daemon/DaemonManager.h
-    SOURCES += src/daemon/DaemonManager.cpp
-}
-
-lupdate_only {
-SOURCES = *.qml \
-          components/*.qml \
-          components/effects/*.qml \
-          pages/*.qml \
-          pages/settings/*.qml \
-          pages/merchant/*.qml \
-          wizard/*.qml \
-          wizard/*js
-}
-
-# Linker flags required by Trezor
-TREZOR_LINKER = $$cat($$WALLET_ROOT/lib/trezor_link_flags.txt)
-
-ios:armv7 {
-    message("target is armv7")
-    LIBS += \
-        -L$$PWD/../ofxiOSBoost/build/libs/boost/lib/armv7 \
-}
-ios:arm64 {
-    message("target is arm64")
-    LIBS += \
-        -L$$PWD/../ofxiOSBoost/build/libs/boost/lib/arm64 \
-}
-
-LIBS_COMMON = \
-    -lgcrypt \
-    -lgpg-error \
-    -lwallet_merged \
-    -llmdb \
-    -lepee \
-    -lunbound \
-    -lsodium \
-    -leasylogging \
-    -lrandomx
-
-!ios:!android {
-    LIBS += -L$$WALLET_ROOT/lib \
-        $$LIBS_COMMON
-}
-
-android {
-    message("Host is Android")
-    LIBS += -L$$WALLET_ROOT/lib \
-        $$LIBS_COMMON
-}
-
-
-
-QMAKE_CXXFLAGS += -Werror -Wformat -Wformat-security
-QMAKE_CFLAGS += -Werror -Wformat -Wformat-security
-QMAKE_CXXFLAGS_RELEASE += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2
-QMAKE_CFLAGS_RELEASE += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2
-
-ios {
-    message("Host is IOS")
-
-    QMAKE_LFLAGS += -v
-    QMAKE_IOS_DEVICE_ARCHS = arm64
-    CONFIG += arm64
-    LIBS += -L$$WALLET_ROOT/lib-ios \
-        $$LIBS_COMMON
-
-    LIBS+= \
-        -L$$PWD/../OpenSSL-for-iPhone/lib \
-        -L$$PWD/../ofxiOSBoost/build/libs/boost/lib/arm64 \
-        -lboost_serialization \
-        -lboost_thread \
-        -lboost_system \
-        -lboost_date_time \
-        -lboost_filesystem \
-        -lboost_regex \
-        -lboost_chrono \
-        -lboost_program_options \
-        -lssl \
-        -lcrypto \
-        -ldl
-}
-
-CONFIG(WITH_SCANNER) {
-    if( greaterThan(QT_MINOR_VERSION, 5) ) {
-        message("using camera scanner")
-        QT += multimedia
-        DEFINES += "WITH_SCANNER"
-        INCLUDEPATH += $$PWD/src/QR-Code-scanner
-        HEADERS += \
-            src/QR-Code-scanner/QrScanThread.h \
-            src/QR-Code-scanner/QrCodeScanner.h
-        SOURCES += \
-            src/QR-Code-scanner/QrScanThread.cpp \
-            src/QR-Code-scanner/QrCodeScanner.cpp
-        android {
-            INCLUDEPATH += $$PWD/../ZBar/include
-            LIBS += -lzbarjni -liconv
-        } else {
-            LIBS += -lzbar
-            macx {
-                ZBAR_DIR = $$system(brew --prefix zbar, lines, EXIT_CODE)
-                equals(EXIT_CODE, 0) {
-                    INCLUDEPATH += $$ZBAR_DIR/include
-                } else {
-                    INCLUDEPATH += /usr/local/include
-                }
-            }
-        }
-    } else {
-        message("Skipping camera scanner because of Incompatible Qt Version !")
-    }
-}
-
-
-# currently we only support x86 build as qt.io only provides prebuilt qt for x86 mingw
-
-win32 {
-
-    # QMAKE_HOST.arch is unreliable, will allways report 32bit if mingw32 shell is run.
-    # Obtaining arch through uname should be reliable. This also fixes building the project in Qt creator without changes.
-    MSYS_HOST_ARCH = $$system(uname -a | grep -o "x86_64")
-
-    # WIN64 Host settings
-    contains(MSYS_HOST_ARCH, x86_64) {
-        message("Host is 64bit")
-        MSYS_ROOT_PATH=c:/msys64
-
-    # WIN32 Host settings
-    } else {
-        message("Host is 32bit")
-        MSYS_ROOT_PATH=c:/msys32
-    }
-
-    # WIN64 Target settings
-    contains(QMAKE_HOST.arch, x86_64) {
-        MSYS_MINGW_PATH=/mingw64
-
-    # WIN32 Target settings
-    } else {
-        MSYS_MINGW_PATH=/mingw32
-    }
-    
-    MSYS_PATH=$$MSYS_ROOT_PATH$$MSYS_MINGW_PATH
-
-    # boost root path
-    BOOST_PATH=$$MSYS_PATH/boost
-    BOOST_MINGW_PATH=$$MSYS_MINGW_PATH/boost
-
-    LIBS+=-L$$MSYS_PATH/lib
-    LIBS+=-L$$MSYS_MINGW_PATH/lib
-    LIBS+=-L$$BOOST_PATH/lib
-    LIBS+=-L$$BOOST_MINGW_PATH/lib
-    
-    QMAKE_LFLAGS += -static-libgcc -static-libstdc++
-
-    LIBS+= \
-        -Wl,-Bdynamic \
-        -lwinscard \
-        -lwsock32 \
-        -lIphlpapi \
-        -lcrypt32 \
-        -lhidapi \
-        -lgdi32 $$TREZOR_LINKER \
-        -Wl,-Bstatic \
-        -lboost_serialization-mt \
-        -lboost_thread-mt \
-        -lboost_system-mt \
-        -lboost_date_time-mt \
-        -lboost_filesystem-mt \
-        -lboost_regex-mt \
-        -lboost_chrono-mt \
-        -lboost_program_options-mt \
-        -lboost_locale-mt \
-        -licuio \
-        -licuin \
-        -licuuc \
-        -licudt \
-        -licutu \
-        -liconv \
-        -lstdc++ \
-        -lpthread \
-        -lsetupapi \
-        -lssl \
-        -lsodium \
-        -lcrypto \
-        -lws2_32 \
-        -lole32
-    
-    !contains(QMAKE_TARGET.arch, x86_64) {
-        message("Target is 32bit")
-        ## Windows x86 (32bit) specific build here
-        ## there's 2Mb stack in libwallet allocated internally, so we set stack=4Mb
-        ## this fixes app crash for x86 Windows build
-        QMAKE_LFLAGS += -Wl,--stack,4194304
-    } else {
-        message("Target is 64bit")
-    }
-
-    QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat
-}
-
-linux {
-    CONFIG(static) {
-        message("using static libraries")
-        LIBS+= -Wl,-Bstatic    
-        QMAKE_LFLAGS += -static-libgcc -static-libstdc++
-        QMAKE_LIBDIR += /usr/local/ssl/lib
-   #     contains(QT_ARCH, x86_64) {
-            LIBS+= -lunbound \
-                   -lusb-1.0 \
-                   -lhidapi-hidraw \
-                   -ludev
-   #     }
-    } else {
-      # On some distro's we need to add dynload
-      LIBS+= -ldl
-    }
-
-    LIBS+= \
-        -lboost_serialization \
-        -lboost_thread \
-        -lboost_system \
-        -lboost_date_time \
-        -lboost_filesystem \
-        -lboost_regex \
-        -lboost_chrono \
-        -lboost_program_options \
-        -lssl \
-        -llmdb \
-        -lsodium \
-        -lhidapi-libusb \
-        -lcrypto $$TREZOR_LINKER
-
-    if(!android) {
-        LIBS+= \
-            -Wl,-Bdynamic \
-            -lGL \
-            -lX11
-    }
-    # currently monero has an issue with "static" build and linunwind-dev,
-    # so we link libunwind-dev only for non-Ubuntu distros
-    CONFIG(libunwind_off) {
-        message(Building without libunwind)
-    } else {
-        message(Building with libunwind)
-        LIBS += -Wl,-Bdynamic -lunwind
-    }
-
-    QMAKE_LFLAGS += -pie -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack
-}
-
-macx {
-    # mixing static and shared libs are not supported on mac
-    # CONFIG(static) {
-    #     message("using static libraries")
-    #     LIBS+= -Wl,-Bstatic
-    # }
-
-    OPENSSL_DIR = $$system(brew --prefix openssl, lines, EXIT_CODE)
-    !equals(EXIT_CODE, 0) {
-        OPENSSL_DIR = /usr/local/ssl
-    }
-    OPENSSL_LIBRARY_DIR = $$OPENSSL_DIR/lib
-    INCLUDEPATH += $$OPENSSL_DIR/include
-
-    BOOST_DIR = $$system(brew --prefix boost, lines, EXIT_CODE)
-    equals(EXIT_CODE, 0) {
-        INCLUDEPATH += $$BOOST_DIR/include
-    } else {
-        INCLUDEPATH += /usr/local/include
-    }
-
-    GCRYPT_DIR = $$system(brew --prefix libgcrypt, lines, EXIT_CODE)
-    equals(EXIT_CODE, 0) {
-        INCLUDEPATH += $$GCRYPT_DIR/include
-    } else {
-        INCLUDEPATH += /usr/local/include
-    }
-
-    GPGP_ERROR_DIR = $$system(brew --prefix libgpg-error, lines, EXIT_CODE)
-    equals(EXIT_CODE, 0) {
-        INCLUDEPATH += $$GPGP_ERROR_DIR/include
-    } else {
-        INCLUDEPATH += /usr/local/include
-    }
-
-    SODIUM_DIR = $$system(brew --prefix libsodium, lines, EXIT_CODE)
-    equals(EXIT_CODE, 0) {
-        INCLUDEPATH += $$SODIUM_DIR/include
-    } else {
-        INCLUDEPATH += /usr/local/include
-    }
-
-    QT += macextras
-    OBJECTIVE_SOURCES += src/qt/macoshelper.mm
-    LIBS+= -Wl,-dead_strip
-    LIBS+= -Wl,-dead_strip_dylibs
-    LIBS+= -Wl,-bind_at_load
-    LIBS+= \
-        -L/usr/local/lib \
-        -L$$OPENSSL_LIBRARY_DIR \
-        -L/usr/local/opt/boost/lib \
-        -lboost_serialization \
-        -lboost_thread-mt \
-        -lboost_system \
-        -lboost_date_time \
-        -lboost_filesystem \
-        -lboost_regex \
-        -lboost_chrono \
-        -lboost_program_options \
-        -framework CoreFoundation \
-        -framework AppKit \
-        -lhidapi \
-        -lssl \
-        -lsodium \
-        -lcrypto \
-        -ldl $$TREZOR_LINKER
-
-    QMAKE_LFLAGS += -pie
-}
-
-
-# translation stuff
-TRANSLATIONS = $$files($$PWD/translations/monero-core_*.ts)
-
-CONFIG(release, debug|release) {
-    DESTDIR = release/bin
-    LANGUPD_OPTIONS = -locations none -no-ui-lines -no-obsolete
-    LANGREL_OPTIONS = -compress -nounfinished -removeidentical
-
-} else {
-    DESTDIR = debug/bin
-    LANGUPD_OPTIONS =
-#    LANGREL_OPTIONS = -markuntranslated "MISS_TR "
-}
-
-TRANSLATION_TARGET_DIR = $$OUT_PWD/translations
-
-!ios {
-    isEmpty(QMAKE_LUPDATE) {
-        win32:LANGUPD = $$[QT_INSTALL_BINS]\lupdate.exe
-        else:LANGUPD = $$[QT_INSTALL_BINS]/lupdate
-    }
-
-    isEmpty(QMAKE_LRELEASE) {
-        win32:LANGREL = $$[QT_INSTALL_BINS]\lrelease.exe
-        else:LANGREL = $$[QT_INSTALL_BINS]/lrelease
-    }
-
-    langupd.command = \
-        $$LANGUPD $$LANGUPD_OPTIONS $$shell_path($$_PRO_FILE) -ts $$_PRO_FILE_PWD/$$TRANSLATIONS
-
-
-
-    langrel.depends = langupd
-    langrel.input = TRANSLATIONS
-    langrel.output = $$TRANSLATION_TARGET_DIR/${QMAKE_FILE_BASE}.qm
-    langrel.commands = \
-        $$LANGREL $$LANGREL_OPTIONS ${QMAKE_FILE_IN} -qm $$TRANSLATION_TARGET_DIR/${QMAKE_FILE_BASE}.qm
-    langrel.CONFIG += no_link
-
-    QMAKE_EXTRA_TARGETS += langupd deploy deploy_win
-    QMAKE_EXTRA_COMPILERS += langrel
-
-    # Compile an initial version of translation files when running qmake
-    # the first time and generate the resource file for translations.
-    !exists($$TRANSLATION_TARGET_DIR) {
-        mkpath($$TRANSLATION_TARGET_DIR)
-    }
-    qrc_entry = "<RCC>"
-    qrc_entry += '  <qresource prefix="/">'
-    write_file($$TRANSLATION_TARGET_DIR/translations.qrc, qrc_entry)
-    for(tsfile, TRANSLATIONS) {
-        qmfile = $$TRANSLATION_TARGET_DIR/$$basename(tsfile)
-        qmfile ~= s/.ts$/.qm/
-        system($$LANGREL $$LANGREL_OPTIONS $$tsfile -qm $$qmfile)
-        qrc_entry = "    <file>$$basename(qmfile)</file>"
-        write_file($$TRANSLATION_TARGET_DIR/translations.qrc, qrc_entry, append)
-    }
-    qrc_entry = "  </qresource>"
-    qrc_entry += "</RCC>"
-    write_file($$TRANSLATION_TARGET_DIR/translations.qrc, qrc_entry, append)
-    RESOURCES += $$TRANSLATION_TARGET_DIR/translations.qrc
-}
-
-
-# Update: no issues with the "slow link process" anymore,
-# for development, just build debug version of libwallet_merged lib
-# by invoking 'get_libwallet_api.sh Debug'
-# so we update translations everytime even for debug build
-
-PRE_TARGETDEPS += langupd compiler_langrel_make_all
-
-RESOURCES += qml.qrc
-CONFIG += qtquickcompiler
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH = fonts
-
-# Default rules for deployment.
-include(deployment.pri)
-macx {
-    deploy.commands += macdeployqt $$sprintf("%1/%2/%3.app", $$OUT_PWD, $$DESTDIR, $$TARGET) -qmldir=$$PWD
-}
-
-win32 {
-    deploy.commands += windeployqt $$sprintf("%1/%2/%3.exe", $$OUT_PWD, $$DESTDIR, $$TARGET) -release -no-translations -qmldir=$$PWD
-    # Win64 msys2 deploy settings
-    contains(QMAKE_HOST.arch, x86_64) {
-        deploy.commands += $$escape_expand(\n\t) $$PWD/windeploy_helper.sh $$DESTDIR
-    }
-}
-
-linux:!android {
-    deploy.commands += $$escape_expand(\n\t) $$PWD/linuxdeploy_helper.sh $$DESTDIR $$TARGET
-}
-
-android{
-    deploy.commands += make install INSTALL_ROOT=$$DESTDIR && androiddeployqt --input android-libmonero-wallet-gui.so-deployment-settings.json --output $$DESTDIR --deployment bundled --android-platform android-21 --jdk /usr/lib/jvm/java-8-openjdk-amd64 -qmldir=$$PWD
-}
-
-
-OTHER_FILES += \
-    .gitignore \
-    $$TRANSLATIONS
-
-DISTFILES += \
-    notes.txt \
-    monero/src/wallet/CMakeLists.txt
-
-VERSION = $$cat('version.js', lines)
-VERSION = $$find(VERSION, 'GUI_VERSION')
-VERSION_LONG = $$replace(VERSION, '.*\"(.*)\"', '\1')
-VERSION = $$replace(VERSION, '.*(\d+\.\d+\.\d+\.\d+).*', '\1')
-
-# windows application icon
-RC_ICONS = images/appicon.ico
-
-# mac Info.plist & application icon
-QMAKE_INFO_PLIST = $$PWD/share/Info.plist
-macx {
-    QMAKE_POST_LINK += sed -i "''" -e "s/@VERSION@/$$VERSION/g" -e "s/@VERSION_LONG@/$$VERSION_LONG/g" "$$sprintf("%1/%2/%3.app", $$OUT_PWD, $$DESTDIR, $$TARGET)/Contents/Info.plist";
-}
-ICON = $$PWD/images/appicon.icns

pages/Account.qml

@@ -48,6 +48,8 @@ Rectangle {
     color: "transparent"
     property var model
     property alias accountHeight: mainLayout.height
+    property alias balanceAllText: balanceAll.text
+    property alias unlockedBalanceAllText: unlockedBalanceAll.text
     property bool selectAndSend: false
     property int currentAccountIndex
 
@@ -188,7 +190,7 @@ Rectangle {
                         height: subaddressAccountListRow.subaddressAccountListItemHeight
                         width: parent ? parent.width : undefined
                         Layout.fillWidth: true
-                        color: "transparent"
+                        color: itemMouseArea.containsMouse || index === currentAccountIndex ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent"
 
                         Rectangle {
                             color: MoneroComponents.Style.appWindowBorderColor
@@ -224,7 +226,7 @@ Rectangle {
 
                             MoneroComponents.Label {
                                 id: nameLabel
-                                color: MoneroComponents.Style.dimmedFontColor
+                                color: index === currentAccountIndex ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
                                 anchors.verticalCenter: parent.verticalCenter
                                 anchors.left: idLabel.right
                                 anchors.leftMargin: 6
@@ -274,11 +276,10 @@ Rectangle {
                             }
 
                             MouseArea {
+                                id: itemMouseArea
                                 cursorShape: Qt.PointingHandCursor
                                 anchors.fill: parent
                                 hoverEnabled: true
-                                onEntered: tableItem2.color = MoneroComponents.Style.titleBarButtonHoverColor
-                                onExited: tableItem2.color = "transparent"
                                 onClicked: {
                                     appWindow.currentWallet.switchSubaddressAccount(index);
                                     if (selectAndSend)

pages/AddressBook.qml

@@ -132,13 +132,13 @@ Rectangle {
                     delegate: Rectangle {
                         id: tableItem2
                         height: addressBookListRow.addressBookListItemHeight
-                        width: parent.width
+                        width: parent ? parent.width : undefined
                         Layout.fillWidth: true
                         color: "transparent"
 
                         function doSend() {
                             console.log("Sending to: ", address +" "+ paymentId);
-                            middlePanel.sendTo(address, paymentId, description);
+                            middlePanel.sendTo(address, paymentId);
                             leftPanel.selectItem(middlePanel.state)
                         }
 
@@ -314,16 +314,16 @@ Rectangle {
                     }
                 }
 
-                inlineButton.text: FontAwesome.qrcode
-                inlineButton.fontPixelSize: 22
-                inlineButton.fontFamily: FontAwesome.fontFamily
-                inlineButton.textColor: MoneroComponents.Style.defaultFontColor
-                inlineButton.buttonColor: MoneroComponents.Style.orange
-                inlineButton.onClicked: {
-                    cameraUi.state = "Capture"
-                    cameraUi.qrcode_decoded.connect(root.updateFromQrCode)
+                MoneroComponents.InlineButton {
+                    buttonColor: MoneroComponents.Style.orange
+                    fontFamily: FontAwesome.fontFamily
+                    text: FontAwesome.qrcode
+                    visible : appWindow.qrScannerEnabled && !addressLine.text
+                    onClicked: {
+                        cameraUi.state = "Capture"
+                        cameraUi.qrcode_decoded.connect(root.updateFromQrCode)
+                    }
                 }
-                inlineButtonVisible : appWindow.qrScannerEnabled && !addressLine.text
             }
 
             MoneroComponents.StandardButton {

pages/Advanced.qml

@@ -0,0 +1,148 @@
+// 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 1.4
+import QtQuick.Controls.Styles 1.4
+import QtQuick.Layouts 1.1
+import "../components" as MoneroComponents
+import "."
+
+ColumnLayout {
+    id: root
+    Layout.fillWidth: true
+    Layout.preferredHeight: 900
+    spacing: 0
+    property int panelHeight: 900
+    property alias miningView: stateView.miningView
+    property alias state: stateView.state
+
+    MoneroComponents.Navbar {
+        Layout.alignment: Qt.AlignHCenter
+        Layout.topMargin: height
+        Layout.bottomMargin: height
+
+        MoneroComponents.NavbarItem {
+            active: state == "Mining"
+            text: qsTr("Mining") + translationManager.emptyString
+            onSelected: state = "Mining"
+        }
+        MoneroComponents.NavbarItem {
+            active: state == "Prove"
+            text: qsTr("Prove/check") + translationManager.emptyString
+            onSelected: state = "Prove"
+        }
+        MoneroComponents.NavbarItem {
+            active: state == "SharedRingDB"
+            text: qsTr("Shared RingDB") + translationManager.emptyString
+            onSelected: state = "SharedRingDB"
+        }
+        MoneroComponents.NavbarItem {
+            active: state == "Sign"
+            text: qsTr("Sign/verify") + translationManager.emptyString
+            onSelected: state = "Sign"
+        }
+    }
+
+    Rectangle{
+        id: stateView
+        property Item currentView
+        property Item previousView
+        property Mining miningView: Mining { }
+        property TxKey prooveView: TxKey { }
+        property SharedRingDB sharedRingDBView: SharedRingDB { }
+        property Sign signView: Sign { }
+        Layout.fillWidth: true
+        Layout.preferredHeight: panelHeight
+        color: "transparent"
+        state: "Mining"
+
+        onCurrentViewChanged: {
+            if (previousView) {
+                if (typeof previousView.onPageClosed === "function") {
+                    previousView.onPageClosed();
+                }
+            }
+            previousView = currentView
+            if (currentView) {
+                stackView.replace(currentView)
+                if (typeof currentView.onPageCompleted === "function") {
+                    currentView.onPageCompleted();
+                }
+            }
+        }
+
+        states: [
+            State {
+                name: "Mining"
+                PropertyChanges { target: stateView; currentView: stateView.miningView }
+                PropertyChanges { target: root; panelHeight: stateView.miningView.miningHeight + 140 }
+            }, State {
+                name: "Prove"
+                PropertyChanges { target: stateView; currentView: stateView.prooveView }
+                PropertyChanges { target: root; panelHeight: stateView.prooveView.txkeyHeight + 140 }
+            }, State {
+                name: "SharedRingDB"
+                PropertyChanges { target: stateView; currentView: stateView.sharedRingDBView }
+                PropertyChanges { target: root; panelHeight: stateView.sharedRingDBView.panelHeight + 140 }
+            }, State {
+                name: "Sign"
+                PropertyChanges { target: stateView; currentView: stateView.signView }
+                PropertyChanges { target: root; panelHeight: stateView.signView.signHeight + 140 }
+            }
+        ]
+
+        StackView {
+            id: stackView
+            initialItem: stateView.miningView
+            anchors.fill: parent
+            clip: false // otherwise animation will affect left panel
+
+            delegate: StackViewDelegate {
+                pushTransition: StackViewTransition {
+                    PropertyAnimation {
+                        target: enterItem
+                        property: "x"
+                        from: 0 - target.width
+                        to: 0
+                        duration: 300
+                        easing.type: Easing.OutCubic
+                    }
+                    PropertyAnimation {
+                        target: exitItem
+                        property: "x"
+                        from: 0
+                        to: target.width
+                        duration: 300
+                        easing.type: Easing.OutCubic
+                    }
+                }
+            }
+        }
+    }
+}

pages/History.qml

@@ -127,7 +127,7 @@ Rectangle {
                     image: "qrc:///images/whiteDropIndicator.png"
                     fontAwesomeFallbackIcon: FontAwesome.arrowDown
                     fontAwesomeFallbackSize: 14
-                    rotation: sortAndFilter.collapsed ? 0 : 180
+                    rotation: sortAndFilter.collapsed ? 180 : 0
                     color: MoneroComponents.Style.defaultFontColor
 
                     MouseArea {
@@ -573,8 +573,7 @@ Rectangle {
                 anchors.right: parent ? parent.right : undefined
                 height: {
                     if(!collapsed) return 60;
-                    if(isout && delegate.address !== "") return 320;
-                    return 220;
+                    return 320;
                 }
                 color: {
                     if(!collapsed) return "transparent"
@@ -618,6 +617,7 @@ Rectangle {
                             spacing: 0
                             clip: true
                             Layout.preferredHeight: 120
+                            Layout.minimumWidth: 180
 
                             Rectangle {
                                 color: "transparent"
@@ -633,17 +633,7 @@ Rectangle {
                                 MoneroComponents.TextPlain {
                                     font.family: MoneroComponents.Style.fontRegular.name
                                     font.pixelSize: 15
-                                    text: {
-                                        if (!isout) {
-                                            return qsTr("Received") + translationManager.emptyString;
-                                        }
-                                        const addressBookName = currentWallet ? currentWallet.addressBook.getDescription(address) : null;
-                                        if (!addressBookName)
-                                        {
-                                            return qsTr("Sent") + translationManager.emptyString;
-                                        }
-                                        return addressBookName;
-                                    }
+                                    text: (isout ? qsTr("Sent") : qsTr("Received")) + translationManager.emptyString
                                     color: MoneroComponents.Style.historyHeaderTextColor
                                     anchors.verticalCenter: parent.verticalCenter
                                     themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor
@@ -659,7 +649,7 @@ Rectangle {
                                 MoneroComponents.TextPlain {
                                     font.family: MoneroComponents.Style.fontRegular.name
                                     font.pixelSize: 15
-                                    text: displayAmount
+                                    text: (amount == 0 ? qsTr("Unknown amount") : displayAmount) + translationManager.emptyString
                                     color: MoneroComponents.Style.defaultFontColor
                                     anchors.verticalCenter: parent.verticalCenter
 
@@ -711,7 +701,7 @@ Rectangle {
                                     font.pixelSize: 15
                                     text: {
                                         if(!isout && confirmationsRequired === 60) return qsTr("Yes") + translationManager.emptyString;
-                                        if(fee !== "") return fee + " XMR";
+                                        if(fee !== "") return Utils.removeTrailingZeros(fee) + " XMR";
                                         return "-";
                                     }
 
@@ -739,6 +729,7 @@ Rectangle {
                             spacing: 0
                             clip: true
                             Layout.preferredHeight: 120
+                            Layout.minimumWidth: 230
 
                             Rectangle {
                                 color: "transparent"
@@ -754,7 +745,7 @@ Rectangle {
                                 MoneroComponents.TextPlain {
                                     font.family: MoneroComponents.Style.fontRegular.name
                                     font.pixelSize: 15
-                                    text: qsTr("Blockheight") + translationManager.emptyString
+                                    text: (isout ? qsTr("To") : qsTr("In")) + translationManager.emptyString
                                     color: MoneroComponents.Style.historyHeaderTextColor
                                     themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor
                                     themeTransitionWhiteColor: MoneroComponents.Style._w_historyHeaderTextColor
@@ -768,15 +759,47 @@ Rectangle {
                                 Layout.preferredHeight: 20
 
                                 MoneroComponents.TextPlain {
+                                    id: addressField
                                     font.family: MoneroComponents.Style.fontRegular.name
-                                    font.pixelSize: 14
-                                    text: blockheight > 0 ? blockheight : qsTr('Pending') + translationManager.emptyString;
+                                    font.pixelSize: 15
+                                    text: {
+                                        if (isout) {
+                                            if (isFailed) {
+                                                return qsTr("Failed") + translationManager.emptyString;
+                                            }
+                                            if (isPending) {
+                                                return qsTr("Waiting confirmation...") + translationManager.emptyString;
+                                            }
+                                            if (address) {
+                                                return (addressBookName ? FontAwesome.addressBook + " " + addressBookName : TxUtils.addressTruncate(address, 8));
+                                            }
+                                            if (amount != 0) {
+                                                return qsTr("Unknown recipient") + translationManager.emptyString;
+                                            } else {
+                                                return qsTr("My wallet") + translationManager.emptyString;
+                                            }
+                                        } else {
+                                            if (receivingAddress) {
+                                                if (subaddrIndex == 0) {
+                                                    return qsTr("Address") + " #0" + " (" + qsTr("Primary address") + ")" + translationManager.emptyString;
+                                                } else {
+                                                    if (receivingAddressLabel) {
+                                                        return qsTr("Address") + " #" + subaddrIndex + " (" + receivingAddressLabel + ")" + translationManager.emptyString;
+                                                    } else {
+                                                        return qsTr("Address") + " #" + subaddrIndex + " (" + TxUtils.addressTruncate(receivingAddress, 4) + ")" + translationManager.emptyString;
+                                                    }
+                                                }
+                                            } else {
+                                                return qsTr("Unknown address") + translationManager.emptyString;
+                                            }
+                                        }
+                                    }
 
                                     color: MoneroComponents.Style.defaultFontColor
                                     anchors.verticalCenter: parent.verticalCenter
 
                                     MouseArea {
-                                        state: "copyable"
+                                        state: isout ? "copyable_address" : "copyable_receiving_address"
                                         anchors.fill: parent
                                         hoverEnabled: true
                                         onEntered: parent.color = MoneroComponents.Style.orange
@@ -847,6 +870,7 @@ Rectangle {
                             spacing: 0
                             clip: true
                             Layout.preferredHeight: 120
+                            Layout.minimumWidth: 130
 
                             Rectangle {
                                 color: "transparent"
@@ -909,9 +933,15 @@ Rectangle {
                                 Layout.preferredHeight: 10
                             }
 
+                            Rectangle {
+                                color: "transparent"
+                                Layout.fillWidth: true
+                                Layout.preferredHeight: 10
+                            }
+
                             Item {
                                 Layout.fillWidth: true
-                                Layout.preferredHeight: 60
+                                Layout.preferredHeight: 50
 
                                 MoneroComponents.StandardButton {
                                     id: btnDetails
@@ -919,7 +949,7 @@ Rectangle {
                                     small: true
                                     label.font.family: FontAwesome.fontFamily
                                     fontSize: 18
-                                    width: 28
+                                    width: 34
 
                                     MouseArea {
                                         state: "details"
@@ -949,7 +979,7 @@ Rectangle {
                                     small: true
                                     label.font.family: FontAwesome.fontFamilyBrands
                                     fontSize: 18
-                                    width: 36
+                                    width: 34
 
                                     MouseArea {
                                         state: "proof"
@@ -1128,7 +1158,6 @@ Rectangle {
                         }
 
                         Rectangle {
-                            visible: isout
                             color: "transparent"
                             Layout.fillWidth: true
                             Layout.preferredHeight: 20
@@ -1136,7 +1165,7 @@ Rectangle {
                             MoneroComponents.TextPlain {
                                 font.family: MoneroComponents.Style.fontRegular.name
                                 font.pixelSize: 15
-                                text: qsTr("Address sent to") + translationManager.emptyString
+                                text: qsTr("Blockheight") + translationManager.emptyString
                                 color: MoneroComponents.Style.historyHeaderTextColor
                                 themeTransitionBlackColor: MoneroComponents.Style._b_historyHeaderTextColor
                                 themeTransitionWhiteColor: MoneroComponents.Style._w_historyHeaderTextColor
@@ -1145,30 +1174,20 @@ Rectangle {
                         }
 
                         Rectangle {
-                            visible: isout
                             color: "transparent"
                             Layout.fillWidth: true
                             Layout.preferredHeight: 20
 
                             MoneroComponents.TextPlain {
                                 font.family: MoneroComponents.Style.fontRegular.name
-                                font.pixelSize: 15
-                                text: {
-                                    if(isout && address !== ""){
-                                        return TxUtils.addressTruncate(address, 24);
-                                    }
-
-                                    if(isout && blockheight === 0)
-                                        return qsTr("Waiting for transaction to leave txpool.") + translationManager.emptyString
-                                    else
-                                        return qsTr("Unknown recipient") + translationManager.emptyString;
-                                }
+                                font.pixelSize: 14
+                                text: (blockheight > 0 ? blockheight : qsTr('Pending')) + translationManager.emptyString;
 
                                 color: MoneroComponents.Style.defaultFontColor
                                 anchors.verticalCenter: parent.verticalCenter
 
                                 MouseArea {
-                                    state: "copyable_address"
+                                    state: "copyable"
                                     anchors.fill: parent
                                     hoverEnabled: true
                                     onEntered: parent.color = MoneroComponents.Style.orange
@@ -1202,7 +1221,8 @@ Rectangle {
                         for(var i = 0; i < res.length; i+=1){
                             if(res[i].containsMouse === true){
                                 if(res[i].state === 'copyable' && res[i].parent.hasOwnProperty('text')) toClipboard(res[i].parent.text);
-                                if(res[i].state === 'copyable_address') root.toClipboard(address);
+                                if(res[i].state === 'copyable_address') (address ? root.toClipboard(address) : root.toClipboard(addressField.text));
+                                if(res[i].state === 'copyable_receiving_address') root.toClipboard(currentWallet.address(subaddrAccount, subaddrIndex));
                                 if(res[i].state === 'copyable_txkey') root.getTxKey(hash, res[i]);
                                 if(res[i].state === 'set_tx_note') root.editDescription(hash, tx_note);
                                 if(res[i].state === 'details') root.showTxDetails(hash, paymentId, destinations, subaddrAccount, subaddrIndex, dateTime, displayAmount, isout);
@@ -1394,6 +1414,12 @@ Rectangle {
                     txs.push(item);
                 } else if(item.address !== "" && item.address.toLowerCase().startsWith(root.sortSearchString.toLowerCase())){
                     txs.push(item);
+                } else if(item.receivingAddress !== "" && item.receivingAddress.toLowerCase().startsWith(root.sortSearchString.toLowerCase())){
+                    txs.push(item);
+                } else if(item.receivingAddressLabel !== "" && item.receivingAddressLabel.toLowerCase().startsWith(root.sortSearchString.toLowerCase())){
+                    txs.push(item);
+                } else if(item.addressBookName !== "" && item.addressBookName.toLowerCase().startsWith(root.sortSearchString.toLowerCase())){
+                    txs.push(item);
                 } else if(typeof item.blockheight !== "undefined" && item.blockheight.toString().startsWith(root.sortSearchString)) {
                     txs.push(item);
                 } else if(item.tx_note.toLowerCase().indexOf(root.sortSearchString.toLowerCase()) !== -1) {
@@ -1472,6 +1498,8 @@ Rectangle {
 
         for (var i = 0; i < count; ++i) {
             var idx = _model.index(i, 0);
+            var isPending = model.data(idx, TransactionHistoryModel.TransactionPendingRole);
+            var isFailed = model.data(idx, TransactionHistoryModel.TransactionFailedRole);
             var isout = _model.data(idx, TransactionHistoryModel.TransactionIsOutRole);
             var amount = _model.data(idx, TransactionHistoryModel.TransactionAmountRole);
             var hash = _model.data(idx, TransactionHistoryModel.TransactionHashRole);
@@ -1488,18 +1516,25 @@ Rectangle {
             var timestamp = new Date(date + " " + time).getTime() / 1000;
             var dateHuman = Utils.ago(timestamp);
 
-            var displayAmount = amount;
-            if(displayAmount === 0){
-                // *sometimes* amount is 0, while the 'destinations string'
+            if (amount === 0) {
+                // transactions to the same account have amount === 0, while the 'destinations string'
                 // has the correct amount, so we try to fetch it from that instead.
-                displayAmount = TxUtils.destinationsToAmount(destinations);
-                displayAmount = Number(displayAmount *1);
+                amount = Number(TxUtils.destinationsToAmount(destinations));
             }
+            var displayAmount = Utils.removeTrailingZeros(amount.toFixed(12)) + " XMR";
 
             var tx_note = currentWallet.getUserNote(hash);
             var address = "";
-            if(isout) {
+            var addressBookName = "";
+            var receivingAddress = "";
+            var receivingAddressLabel = "";
+
+            if (isout) {
                 address = TxUtils.destinationsToAddress(destinations);
+                addressBookName = currentWallet ? currentWallet.addressBook.getDescription(address) : null;
+            } else {
+                receivingAddress = currentWallet ? currentWallet.address(subaddrAccount, subaddrIndex) : null;
+                receivingAddressLabel = currentWallet ? appWindow.currentWallet.getSubaddressLabel(subaddrAccount, subaddrIndex) : null;
             }
 
             if (isout)
@@ -1509,12 +1544,15 @@ Rectangle {
 
             root.txModelData.push({
                 "i": i,
+                "isPending": isPending,
+                "isFailed": isFailed,
                 "isout": isout,
-                "amount": Number(amount),
-                "displayAmount": Utils.removeTrailingZeros(displayAmount.toFixed(12)) + " XMR",
+                "amount": amount,
+                "displayAmount": displayAmount,
                 "hash": hash,
                 "paymentId": paymentId,
                 "address": address,
+                "addressBookName": addressBookName,
                 "destinations": destinations,
                 "tx_note": tx_note,
                 "dateHuman": dateHuman,
@@ -1525,6 +1563,8 @@ Rectangle {
                 "fee": fee,
                 "confirmations": confirmations,
                 "confirmationsRequired": confirmationsRequired,
+                "receivingAddress": receivingAddress,
+                "receivingAddressLabel": receivingAddressLabel,
                 "subaddrAccount": subaddrAccount,
                 "subaddrIndex": subaddrIndex
             });
@@ -1692,7 +1732,7 @@ Rectangle {
             informationPopup.open();
         }
         Component.onCompleted: {
-            var _folder = 'file://' + moneroAccountsDir;
+            var _folder = 'file://' + appWindow.accountsDir;
             try {
                 _folder = 'file://' + desktopFolder;
             }

pages/Mining.qml

@@ -42,7 +42,7 @@ Rectangle {
         id: mainLayout
         Layout.fillWidth: true
         anchors.margins: 20
-        anchors.topMargin: 40
+        anchors.topMargin: 0
         anchors.left: parent.left
         anchors.top: parent.top
         anchors.right: parent.right

pages/Receive.qml

@@ -107,7 +107,7 @@ Rectangle {
                         height: subaddressListRow.subaddressListItemHeight
                         width: parent ? parent.width : undefined
                         Layout.fillWidth: true
-                        color: "transparent"
+                        color: itemMouseArea.containsMouse || index === appWindow.current_subaddress_table_index ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent"
 
                         Rectangle{
                             anchors.right: parent.right
@@ -143,7 +143,7 @@ Rectangle {
 
                             MoneroComponents.Label {
                                 id: nameLabel
-                                color: MoneroComponents.Style.dimmedFontColor
+                                color: index === appWindow.current_subaddress_table_index ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
                                 anchors.verticalCenter: parent.verticalCenter
                                 anchors.left: idLabel.right
                                 anchors.leftMargin: 6
@@ -167,11 +167,10 @@ Rectangle {
                             }
 
                             MouseArea {
+                                id: itemMouseArea
                                 cursorShape: Qt.PointingHandCursor
                                 anchors.fill: parent
                                 hoverEnabled: true
-                                onEntered: tableItem2.color = MoneroComponents.Style.titleBarButtonHoverColor
-                                onExited: tableItem2.color = "transparent"
                                 onClicked: subaddressListView.currentIndex = index;
                             }
                         }
@@ -299,18 +298,6 @@ Rectangle {
                 onClicked: qrFileDialog.open()
             }
 
-            MoneroComponents.StandardButton {
-                Layout.preferredWidth: 220
-                small: true
-                text: FontAwesome.clipboard + "  %1".arg(qsTr("Copy to clipboard")) + translationManager.emptyString
-                label.font.family: FontAwesome.fontFamily
-                fontSize: 13
-                onClicked: {
-                    clipboard.setText(TxUtils.makeQRCodeString(appWindow.current_address));
-                    appWindow.showStatusMessage(qsTr("Copied to clipboard") + translationManager.emptyString, 3);
-                }
-            }
-
             MoneroComponents.StandardButton {
                 Layout.preferredWidth: 220
                 small: true

pages/SharedRingDB.qml

@@ -81,8 +81,7 @@ Rectangle {
         id: mainLayout
         Layout.fillWidth: true
         anchors.margins: 20
-        anchors.topMargin: 40
-  
+        anchors.topMargin: 0
         anchors.left: parent.left
         anchors.top: parent.top
         anchors.right: parent.right

pages/Sign.qml

@@ -89,8 +89,7 @@ Rectangle {
         id: mainLayout
         Layout.fillWidth: true
         anchors.margins: 20
-        anchors.topMargin: 40
-
+        anchors.topMargin: 0
         anchors.left: parent.left
         anchors.top: parent.top
         anchors.right: parent.right

pages/Transfer.qml

@@ -26,6 +26,7 @@
 // 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 QtQml.Models 2.2
 import QtQuick 2.9
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
@@ -44,8 +45,7 @@ import "../js/Utils.js" as Utils
 
 Rectangle {
     id: root
-    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()
 
     color: "transparent"
@@ -61,19 +61,18 @@ Rectangle {
         }
 
         // There are sufficient unlocked funds available
-        if (walletManager.amountFromString(amountLine.text) > appWindow.getUnlockedBalance()) {
+        if (recipientModel.getAmountTotal() > appWindow.getUnlockedBalance()) {
             return qsTr("Amount is more than unlocked balance.") + translationManager.emptyString;
         }
 
-        if (addressLine.text)
-        {
+        if (!recipientModel.hasEmptyAddress()) {
             // Address is valid
-            if (!TxUtils.checkAddress(addressLine.text, appWindow.persistentSettings.nettype)) {
+            if (recipientModel.hasInvalidAddress()) {
                 return qsTr("Address is invalid.") + translationManager.emptyString;
             }
 
             // Amount is nonzero
-            if (!amountLine.text || parseFloat(amountLine.text) <= 0) {
+            if (recipientModel.hasEmptyAmount()) {
                 return qsTr("Enter an amount.") + translationManager.emptyString;
             }
         }
@@ -93,12 +92,22 @@ Rectangle {
       oaPopup.open()
     }
 
+    function fillPaymentDetails(address, payment_id, amount, tx_description, recipient_name) {
+        if (recipientModel.count > 0) {
+            const last = recipientModel.count - 1;
+            if (recipientModel.get(recipientModel.count - 1).address == "") {
+                recipientModel.remove(last);
+            }
+        }
+
+        recipientModel.newRecipient(address, Utils.removeTrailingZeros(amount || ""));
+        setPaymentId(payment_id || "");
+        setDescription((recipient_name ? recipient_name + " " : "") + (tx_description || ""));
+    }
+
     function updateFromQrCode(address, payment_id, amount, tx_description, recipient_name) {
         console.log("updateFromQrCode")
-        addressLine.text = address
-        setPaymentId(payment_id);
-        amountLine.text = amount
-        setDescription(recipient_name + " " + tx_description);
+        fillPaymentDetails(address, payment_id, amount, tx_description, recipient_name);
         cameraUi.qrcode_decoded.disconnect(updateFromQrCode)
     }
 
@@ -113,10 +122,8 @@ Rectangle {
     }
 
     function clearFields() {
-        addressLine.text = ""
-        setPaymentId("");
-        amountLine.text = ""
-        setDescription("");
+        recipientModel.clear();
+        fillPaymentDetails("", "", "", "", "");
         priorityDropdown.currentIndex = 0
     }
 
@@ -163,166 +170,496 @@ Rectangle {
           }
       }
 
-      // recipient address input
-      RowLayout {
-          id: addressLineRow
-          Layout.fillWidth: true
+        ListModel {
+            id: recipientModel
 
-          LineEditMulti {
-              id: addressLine
-              spacing: 0
-              inputPaddingRight: inlineButtonVisible && inlineButton2Visible ? 100 : 60
-              fontBold: true
-              labelText: qsTr("Address") + translationManager.emptyString
-              labelButtonText: qsTr("Resolve") + translationManager.emptyString
-              placeholderText: {
-                  if(persistentSettings.nettype == NetworkType.MAINNET){
-                      return "4.. / 8.. / OpenAlias";
-                  } else if (persistentSettings.nettype == NetworkType.STAGENET){
-                      return "5.. / 7..";
-                  } else if(persistentSettings.nettype == NetworkType.TESTNET){
-                      return "9.. / B..";
-                  }
-              }
-              wrapMode: Text.WrapAnywhere
-              addressValidation: true
-              onTextChanged: {
-                  const parsed = walletManager.parse_uri_to_object(text);
-                  if (!parsed.error) {
-                    addressLine.text = parsed.address;
-                    setPaymentId(parsed.payment_id);
-                    amountLine.text = parsed.amount;
-                    setDescription(parsed.tx_description);
-                  }
-              }
-              inlineButton.text: FontAwesome.addressBook
-              inlineButton.buttonHeight: 30
-              inlineButton.fontPixelSize: 22
-              inlineButton.fontFamily: FontAwesome.fontFamily
-              inlineButton.textColor: MoneroComponents.Style.defaultFontColor
-              inlineButton.onClicked: {
-                  middlePanel.addressBookView.selectAndSend = true;
-                  appWindow.showPageRequest("AddressBook");
-              }
-              inlineButtonVisible: true
-              
-              inlineButton2.text: FontAwesome.qrcode
-              inlineButton2.buttonHeight: 30
-              inlineButton2.fontPixelSize: 22
-              inlineButton2.fontFamily: FontAwesome.fontFamily
-              inlineButton2.textColor: MoneroComponents.Style.defaultFontColor
-              inlineButton2.onClicked: {
-                   cameraUi.state = "Capture"
-                   cameraUi.qrcode_decoded.connect(updateFromQrCode)
-              }
-              inlineButton2Visible: appWindow.qrScannerEnabled
-          }
-      }
+            readonly property int maxRecipients: 16
 
-      StandardButton {
-          id: resolveButton
-          width: 80
-          text: qsTr("Resolve") + translationManager.emptyString
-          visible: TxUtils.isValidOpenAliasAddress(addressLine.text)
-          enabled : visible
-          onClicked: {
-              var result = walletManager.resolveOpenAlias(addressLine.text)
-              if (result) {
-                  var parts = result.split("|")
-                  if (parts.length == 2) {
-                      var address_ok = walletManager.addressValid(parts[1], appWindow.persistentSettings.nettype)
-                      if (parts[0] === "true") {
-                          if (address_ok) {
-                              // prepend openalias to description
-                              descriptionLine.text = descriptionLine.text ? addressLine.text + " " + descriptionLine.text : addressLine.text
-                              descriptionCheckbox.checked = true
-                              addressLine.text = parts[1]
-                          }
-                          else
-                              oa_message(qsTr("No valid address found at this OpenAlias address"))
-                      }
-                      else if (parts[0] === "false") {
-                            if (address_ok) {
-                                addressLine.text = parts[1]
-                                oa_message(qsTr("Address found, but the DNSSEC signatures could not be verified, so this address may be spoofed"))
-                            }
-                            else
-                            {
-                                oa_message(qsTr("No valid address found at this OpenAlias address, but the DNSSEC signatures could not be verified, so this may be spoofed"))
-                            }
-                      }
-                      else {
-                          oa_message(qsTr("Internal error"))
-                      }
-                  }
-                  else {
-                      oa_message(qsTr("Internal error"))
-                  }
-              }
-              else {
-                  oa_message(qsTr("No address found"))
-              }
-          }
-      }
+            ListElement {
+                address: ""
+                amount: ""
+            }
 
-      GridLayout {
-          columns: appWindow.walletMode < 2 ? 1 : 2
-          Layout.fillWidth: true
-          columnSpacing: 32
+            function newRecipient(address, amount) {
+                if (recipientModel.count < maxRecipients) {
+                    recipientModel.append({address: address, amount: amount});
+                    return true;
+                }
+                return false;
+            }
 
-          ColumnLayout {
-              Layout.fillWidth: true
-              Layout.minimumWidth: 200
+            function getRecipients() {
+                var recipients = [];
+                for (var index = 0; index < recipientModel.count; ++index) {
+                    const recipient = recipientModel.get(index);
+                    recipients.push({
+                        address: recipient.address,
+                        amount: recipient.amount,
+                    });
+                }
+                return recipients;
+            }
 
-              // Amount input
-              LineEdit {
-                  id: amountLine
-                  Layout.fillWidth: true
-                  inlineIcon: true
-                  labelText: "<style type='text/css'>a {text-decoration: none; color: #858585; font-size: 14px;}</style>\
-                                   %1 <a href='#'>(%2)</a>".arg(qsTr("Amount")).arg(qsTr("Change account"))
-                             + translationManager.emptyString
-                  copyButton: !isNaN(amountLine.text) && persistentSettings.fiatPriceEnabled
-                  copyButtonText: "~%1 %2".arg(fiatApiConvertToFiat(amountLine.text)).arg(fiatApiCurrencySymbol())
-                  copyButtonEnabled: false
+            function getAmountTotal() {
+                var sum = [];
+                for (var index = 0; index < recipientModel.count; ++index) {
+                    const amount = recipientModel.get(index).amount;
+                    if (amount == "(all)") {
+                        return appWindow.getUnlockedBalance();
+                    }
+                    sum.push(amount || "0");
+                }
+                return walletManager.amountsSumFromStrings(sum);
+            }
 
-                  onLabelLinkActivated: {
-                      middlePanel.accountView.selectAndSend = true;
-                      appWindow.showPageRequest("Account")
-                  }
-                  placeholderText: "0.00"
-                  width: 100
-                  fontBold: true
-                  inlineButtonText: qsTr("All") + translationManager.emptyString
-                  inlineButton.onClicked: amountLine.text = "(all)"
-                  onTextChanged: {
-                        amountLine.text = amountLine.text.replace(",", ".");
-                        const match = amountLine.text.match(/^0+(\d.*)/);
-                        if (match) {
-                            const cursorPosition = amountLine.cursorPosition;
-                            amountLine.text = match[1];
-                            amountLine.cursorPosition = Math.max(cursorPosition, 1) - 1;
-                        } else if(amountLine.text.indexOf('.') === 0){
-                            amountLine.text = '0' + amountLine.text;
-                            if (amountLine.text.length > 2) {
-                                amountLine.cursorPosition = 1;
+            function hasEmptyAmount() {
+                for (var index = 0; index < recipientModel.count; ++index) {
+                    if (recipientModel.get(index).amount === "") {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            function hasEmptyAddress() {
+                for (var index = 0; index < recipientModel.count; ++index) {
+                    if (recipientModel.get(index).address === "") {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            function hasInvalidAddress() {
+                for (var index = 0; index < recipientModel.count; ++index) {
+                    if (!TxUtils.checkAddress(recipientModel.get(index).address, appWindow.persistentSettings.nettype)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+
+        Item {
+            Layout.fillWidth: true
+            implicitHeight: recipientLayout.height
+
+            ColumnLayout {
+                id: recipientLayout
+                anchors.left: parent.left
+                anchors.right: parent.right
+                spacing: 0
+
+                readonly property int colSpacing: 10
+                readonly property int rowSpacing: 10
+                readonly property int secondRowWidth: 125
+                readonly property int thirdRowWidth: 50
+
+                RowLayout {
+                    Layout.bottomMargin: recipientLayout.rowSpacing / 2
+                    spacing: recipientLayout.colSpacing
+
+                    RowLayout {
+                        id: addressLabel
+                        spacing: 6
+                        Layout.fillWidth: true
+
+                        MoneroComponents.TextPlain {
+                            Layout.leftMargin: 10
+                            font.family: MoneroComponents.Style.fontRegular.name
+                            font.pixelSize: 16
+                            color: MoneroComponents.Style.defaultFontColor
+                            text: qsTr("Address") + translationManager.emptyString
+                        }
+
+                        MoneroComponents.InlineButton {
+                            fontFamily: FontAwesome.fontFamily
+                            fontPixelSize: 18
+                            text: FontAwesome.desktop
+                            onClicked: {
+                                clearFields();
+                                const codes = oshelper.grabQrCodesFromScreen();
+                                for (var index = 0; index < codes.length; ++index) {
+                                    const parsed = walletManager.parse_uri_to_object(codes[index]);
+                                    if (!parsed.error) {
+                                        fillPaymentDetails(parsed.address, parsed.payment_id, parsed.amount, parsed.tx_description, parsed.recipient_name);
+                                        break;
+                                    }
+                                }
                             }
                         }
-                        amountLine.error = walletManager.amountFromString(amountLine.text) > appWindow.getUnlockedBalance()
-                  }
 
-                  validator: RegExpValidator {
-                      regExp: /^(\d{1,8})?([\.,]\d{1,12})?$/
-                  }
-              }
+                        MoneroComponents.InlineButton {
+                            fontFamily: FontAwesome.fontFamily
+                            text: FontAwesome.qrcode
+                            visible: appWindow.qrScannerEnabled
+                            onClicked: {
+                                cameraUi.state = "Capture"
+                                cameraUi.qrcode_decoded.connect(updateFromQrCode)
+                            }
+                        }
+
+                        MoneroComponents.InlineButton {
+                            fontFamily: FontAwesome.fontFamily
+                            text: FontAwesome.addressBook
+                            onClicked: {
+                                middlePanel.addressBookView.selectAndSend = true;
+                                appWindow.showPageRequest("AddressBook");
+                            }
+                        }
+
+                        Item {
+                            Layout.fillWidth: true
+                        }
+                    }
+
+                    MoneroComponents.TextPlain {
+                        Layout.preferredWidth: recipientLayout.secondRowWidth
+                        font.family: MoneroComponents.Style.fontRegular.name
+                        font.pixelSize: 16
+                        color: MoneroComponents.Style.defaultFontColor
+                        text: qsTr("Amount") + translationManager.emptyString
+                    }
+
+                    Item {
+                        Layout.preferredWidth: recipientLayout.thirdRowWidth
+                    }
+                }
+
+                Repeater {
+                    id: recipientRepeater
+                    model: recipientModel
+
+                    ColumnLayout {
+                        spacing: 0
+
+                        Rectangle {
+                            Layout.fillWidth: true
+                            Layout.rightMargin: recipientLayout.thirdRowWidth
+                            color: MoneroComponents.Style.inputBorderColorInActive
+                            height: 1
+                            visible: index > 0
+                        }
+
+                        RowLayout {
+                            spacing: 0
+
+                            MoneroComponents.LineEditMulti {
+                                KeyNavigation.backtab: index > 0 ? recipientRepeater.itemAt(index - 1).children[1].children[2] : sendButton
+                                KeyNavigation.tab: parent.children[2]
+                                Layout.alignment: Qt.AlignVCenter
+                                Layout.topMargin: index > 0 ? recipientLayout.rowSpacing / 2 : 0
+                                Layout.bottomMargin: recipientLayout.rowSpacing / 2
+                                Layout.fillWidth: true
+                                addressValidation: true
+                                borderDisabled: true
+                                fontFamily: MoneroComponents.Style.fontMonoRegular.name
+                                fontSize: 14
+                                inputPaddingBottom: 0
+                                inputPaddingTop: 0
+                                inputPaddingRight: 0
+                                placeholderFontFamily: MoneroComponents.Style.fontMonoRegular.name
+                                placeholderFontSize: 14
+                                spacing: 0
+                                wrapMode: Text.WrapAnywhere
+                                placeholderText: {
+                                    if(persistentSettings.nettype == NetworkType.MAINNET){
+                                        return "4.. / 8.. / OpenAlias";
+                                    } else if (persistentSettings.nettype == NetworkType.STAGENET){
+                                        return "5.. / 7..";
+                                    } else if(persistentSettings.nettype == NetworkType.TESTNET){
+                                        return "9.. / B..";
+                                    }
+                                }
+                                onTextChanged: {
+                                    const parsed = walletManager.parse_uri_to_object(text);
+                                    if (!parsed.error) {
+                                        fillPaymentDetails(parsed.address, parsed.payment_id, parsed.amount, parsed.tx_description);
+                                    }
+                                    address = text;
+                                }
+                                text: address
+
+                                MoneroComponents.InlineButton {
+                                    small: true
+                                    text: qsTr("Resolve") + translationManager.emptyString
+                                    visible: TxUtils.isValidOpenAliasAddress(address)
+                                    onClicked: {
+                                        var result = walletManager.resolveOpenAlias(address)
+                                        if (result) {
+                                            var parts = result.split("|")
+                                            if (parts.length == 2) {
+                                                var address_ok = walletManager.addressValid(parts[1], appWindow.persistentSettings.nettype)
+                                                if (parts[0] === "true") {
+                                                    if (address_ok) {
+                                                        // prepend openalias to description
+                                                        descriptionLine.text = descriptionLine.text ? address + " " + descriptionLine.text : address
+                                                        descriptionCheckbox.checked = true
+                                                        recipientRepeater.itemAt(index).children[1].children[0].text = parts[1];
+                                                    }
+                                                    else
+                                                        oa_message(qsTr("No valid address found at this OpenAlias address"))
+                                                }
+                                                else if (parts[0] === "false") {
+                                                        if (address_ok) {
+                                                            recipientRepeater.itemAt(index).children[1].children[0].text = parts[1];
+                                                            oa_message(qsTr("Address found, but the DNSSEC signatures could not be verified, so this address may be spoofed"))
+                                                        }
+                                                        else
+                                                        {
+                                                            oa_message(qsTr("No valid address found at this OpenAlias address, but the DNSSEC signatures could not be verified, so this may be spoofed"))
+                                                        }
+                                                }
+                                                else {
+                                                    oa_message(qsTr("Internal error"))
+                                                }
+                                            }
+                                            else {
+                                                oa_message(qsTr("Internal error"))
+                                            }
+                                        }
+                                        else {
+                                            oa_message(qsTr("No address found"))
+                                        }
+                                    }
+                                }
+                            }
+
+                            Rectangle {
+                                Layout.fillHeight: true
+                                Layout.leftMargin: recipientLayout.colSpacing / 2 - width
+                                Layout.rightMargin: recipientLayout.colSpacing / 2
+                                color: MoneroComponents.Style.inputBorderColorInActive
+                                width: 1
+                            }
+
+                            MoneroComponents.LineEdit {
+                                KeyNavigation.backtab: parent.children[0]
+                                KeyNavigation.tab: index + 1 < recipientRepeater.count ? recipientRepeater.itemAt(index + 1).children[1].children[0] : sendButton
+                                Layout.alignment: Qt.AlignVCenter
+                                Layout.topMargin: recipientLayout.rowSpacing / 2
+                                Layout.bottomMargin: recipientLayout.rowSpacing / 2
+                                Layout.rightMargin: recipientLayout.colSpacing / 2
+                                Layout.preferredWidth: 125
+                                borderDisabled: true
+                                fontFamily: MoneroComponents.Style.fontMonoRegular.name
+                                fontSize: 14
+                                inputPadding: 0
+                                placeholderFontFamily: MoneroComponents.Style.fontMonoRegular.name
+                                placeholderFontSize: 14
+                                placeholderLeftMargin: 0
+                                placeholderText: "0.00"
+                                text: amount
+                                onTextChanged: {
+                                    text = text.trim().replace(",", ".");
+                                    const match = text.match(/^0+(\d.*)/);
+                                    if (match) {
+                                        const cursorPosition = cursorPosition;
+                                        text = match[1];
+                                        cursorPosition = Math.max(cursorPosition, 1) - 1;
+                                    } else if(text.indexOf('.') === 0){
+                                        text = '0' + text;
+                                        if (text.length > 2) {
+                                            cursorPosition = 1;
+                                        }
+                                    }
+                                    error = walletManager.amountFromString(text) > appWindow.getUnlockedBalance();
+
+                                    amount = text;
+                                }
+                                validator: RegExpValidator {
+                                    regExp: /^\s*(\d{1,8})?([\.,]\d{1,12})?\s*$/
+                                }
+                            }
+
+                            MoneroComponents.TextPlain {
+                                Layout.leftMargin: recipientLayout.colSpacing / 2
+                                Layout.preferredWidth: recipientLayout.thirdRowWidth
+                                font.family: FontAwesome.fontFamilySolid
+                                font.styleName: "Solid"
+                                horizontalAlignment: Text.AlignHCenter
+                                opacity: mouseArea.containsMouse ? 1 : 0.85
+                                text: recipientModel.count == 1 ? FontAwesome.infinity : FontAwesome.times
+
+                                MouseArea {
+                                    id: mouseArea
+                                    anchors.fill: parent
+                                    cursorShape: Qt.PointingHandCursor
+                                    hoverEnabled: true
+                                    onClicked: {
+                                        if (recipientModel.count == 1) {
+                                            parent.parent.children[2].text = "(all)";
+                                        } else {
+                                            recipientModel.remove(index);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                GridLayout {
+                    id: totalLayout
+                    Layout.topMargin: recipientLayout.rowSpacing / 2
+                    Layout.fillWidth: true
+                    columns: 3
+                    columnSpacing: recipientLayout.colSpacing
+                    rowSpacing: 0
+
+                    RowLayout {
+                        Layout.column: 0
+                        Layout.row: 0
+                        Layout.fillWidth: true
+                        spacing: 0
+
+                        CheckBox {
+                            border: false
+                            checked: false
+                            enabled: {
+                                if (recipientModel.count > 0 && recipientModel.get(0).amount == "(all)") {
+                                    return false;
+                                }
+                                if (recipientModel.count >= recipientModel.maxRecipients) {
+                                    return false;
+                                }
+                                return true;
+                            }
+                            fontAwesomeIcons: true
+                            fontSize: descriptionLine.labelFontSize
+                            iconOnTheLeft: true
+                            text: qsTr("Add recipient") + translationManager.emptyString
+                            toggleOnClick: false
+                            uncheckedIcon: FontAwesome.plusCircle
+                            onClicked: {
+                                recipientModel.newRecipient("", "");
+                            }
+                        }
+
+                        MoneroComponents.TextPlain {
+                            Layout.fillWidth: true
+                            horizontalAlignment: Text.AlignRight
+                            font.family: MoneroComponents.Style.fontRegular.name
+                            font.pixelSize: 16
+                            text: recipientModel.count > 1 ? qsTr("Total") + translationManager.emptyString : ""
+                        }
+                    }
+
+                    MoneroComponents.LineEdit {
+                        id: totalValue
+                        Layout.column: 1
+                        Layout.row: 0
+                        Layout.preferredWidth: recipientLayout.secondRowWidth
+                        borderDisabled: true
+                        fontFamily: MoneroComponents.Style.fontMonoRegular.name
+                        fontSize: 14
+                        inputHeight: 30
+                        inputPadding: 0
+                        readOnly: true
+                        text: Utils.removeTrailingZeros(walletManager.displayAmount(recipientModel.getAmountTotal()))
+                        visible: recipientModel.count > 1
+                    }
+
+                    MoneroComponents.TextPlain {
+                        Layout.column: 2
+                        Layout.row: 0
+                        Layout.preferredWidth: recipientLayout.thirdRowWidth
+                        horizontalAlignment: Text.AlignHCenter
+                        font.family: MoneroComponents.Style.fontRegular.name
+                        text: "XMR"
+                        visible: recipientModel.count > 1
+                    }
+
+                    MoneroComponents.LineEdit {
+                        Layout.column: 1
+                        Layout.row: recipientModel.count > 1 ? 1 : 0
+                        Layout.preferredWidth: recipientLayout.secondRowWidth
+                        borderDisabled: true
+                        fontFamily: MoneroComponents.Style.fontMonoRegular.name
+                        fontSize: 14
+                        inputHeight: 30
+                        inputPadding: 0
+                        opacity: 0.7
+                        readOnly: true
+                        text: fiatApiConvertToFiat(walletManager.displayAmount(recipientModel.getAmountTotal()))
+                        visible: persistentSettings.fiatPriceEnabled
+                    }
+
+                    MoneroComponents.TextPlain {
+                        Layout.column: 2
+                        Layout.row: recipientModel.count > 1 ? 1 : 0
+                        Layout.preferredWidth: recipientLayout.thirdRowWidth
+                        font.family: MoneroComponents.Style.fontRegular.name
+                        horizontalAlignment: Text.AlignHCenter
+                        opacity: 0.7
+                        text: fiatApiCurrencySymbol()
+                        visible: persistentSettings.fiatPriceEnabled
+                    }
+                }
+            }
+
+            Rectangle {
+                anchors.top: recipientLayout.top
+                anchors.topMargin: addressLabel.height + recipientLayout.rowSpacing / 2
+                anchors.bottom: recipientLayout.bottom
+                anchors.bottomMargin: totalLayout.height + recipientLayout.rowSpacing / 2
+                anchors.left: recipientLayout.left
+                anchors.right: recipientLayout.right
+                anchors.rightMargin: recipientLayout.thirdRowWidth
+                color: "transparent"
+                border.color: MoneroComponents.Style.inputBorderColorInActive
+                border.width: 1
+                radius: 4
+            }
+        }
+
+        ColumnLayout {
+            spacing: 0
+            visible: appWindow.walletMode >= 2
+
+            Label {
+                id: transactionPriority
+                Layout.topMargin: 0
+                text: qsTr("Transaction priority") + translationManager.emptyString
+                fontBold: false
+                fontSize: 16
+            }
+            // Note: workaround for translations in listElements
+            // ListElement: cannot use script for property value, so
+            // code like this wont work:
+            // ListElement { column1: qsTr("LOW") + translationManager.emptyString ; column2: ""; priority: PendingTransaction.Priority_Low }
+            // For translations to work, the strings need to be listed in
+            // the file components/StandardDropdown.qml too.
+
+            // Priorites after v5
+            ListModel {
+                id: priorityModelV5
+
+                ListElement { column1: qsTr("Automatic") ; column2: ""; priority: 0}
+                ListElement { column1: qsTr("Slow (x0.2 fee)") ; column2: ""; priority: 1}
+                ListElement { column1: qsTr("Normal (x1 fee)") ; column2: ""; priority: 2 }
+                ListElement { column1: qsTr("Fast (x5 fee)") ; column2: ""; priority: 3 }
+                ListElement { column1: qsTr("Fastest (x200 fee)")  ; column2: "";  priority: 4 }
+            }
+
+            RowLayout {
+                Layout.topMargin: 5
+                spacing: 10
+
+                StandardDropdown {
+                    Layout.preferredWidth: 200
+                    id: priorityDropdown
+                    currentIndex: 0
+                    dataModel: priorityModelV5
+                }
 
                 MoneroComponents.TextPlain {
                     id: feeLabel
-                    Layout.alignment: Qt.AlignRight
-                    Layout.topMargin: 12
+                    Layout.alignment: Qt.AlignVCenter
                     font.family: MoneroComponents.Style.fontRegular.name
                     font.pixelSize: 14
                     color: MoneroComponents.Style.defaultFontColor
+                    opacity: 0.7
                     property bool estimating: false
                     property var estimatedFee: null
                     property string estimatedFeeFiat: {
@@ -338,12 +675,21 @@ Rectangle {
                         if (!sendButton.enabled || !currentWallet) {
                             return;
                         }
+                        var addresses = [];
+                        var amounts = [];
+                        for (var index = 0; index < recipientModel.count; ++index) {
+                            const recipient = recipientModel.get(index);
+                            addresses.push(recipient.address);
+                            amounts.push(walletManager.amountFromString(recipient.amount));
+                        }
                         currentWallet.estimateTransactionFeeAsync(
-                            addressLine.text,
-                            walletManager.amountFromString(amountLine.text),
+                            addresses,
+                            amounts,
                             priorityModelV5.get(priorityDropdown.currentIndex).priority,
                             function (amount) {
-                                estimatedFee = Utils.removeTrailingZeros(amount);
+                                if (amount) {
+                                    estimatedFee = Utils.removeTrailingZeros(amount);
+                                }
                                 estimating = false;
                             });
                     }
@@ -351,56 +697,20 @@ Rectangle {
                         if (!sendButton.enabled || estimatedFee == null) {
                             return ""
                         }
-                        return "%1: ~%2 XMR".arg(qsTr("Fee")).arg(estimatedFee) +
-                            estimatedFeeFiat +
-                            translationManager.emptyString;
+                        return "~%1 XMR%2 %3".arg(estimatedFee)
+                            .arg(estimatedFeeFiat)
+                            .arg(qsTr("fee") + translationManager.emptyString);
                     }
 
                     BusyIndicator {
-                        anchors.right: parent.right
+                        anchors.left: parent.left
                         running: feeLabel.estimating
                         height: parent.height
+                        width: height
                     }
                 }
-          }
-
-          ColumnLayout {
-              visible: appWindow.walletMode >= 2
-              Layout.alignment: Qt.AlignTop
-              Label {
-                  id: transactionPriority
-                  Layout.topMargin: 0
-                  text: qsTr("Transaction priority") + translationManager.emptyString
-                  fontBold: false
-                  fontSize: 16
-              }
-              // Note: workaround for translations in listElements
-              // ListElement: cannot use script for property value, so
-              // code like this wont work:
-              // ListElement { column1: qsTr("LOW") + translationManager.emptyString ; column2: ""; priority: PendingTransaction.Priority_Low }
-              // For translations to work, the strings need to be listed in
-              // the file components/StandardDropdown.qml too.
-
-              // Priorites after v5
-              ListModel {
-                   id: priorityModelV5
-
-                   ListElement { column1: qsTr("Automatic") ; column2: ""; priority: 0}
-                   ListElement { column1: qsTr("Slow (x0.2 fee)") ; column2: ""; priority: 1}
-                   ListElement { column1: qsTr("Normal (x1 fee)") ; column2: ""; priority: 2 }
-                   ListElement { column1: qsTr("Fast (x5 fee)") ; column2: ""; priority: 3 }
-                   ListElement { column1: qsTr("Fastest (x200 fee)")  ; column2: "";  priority: 4 }
-               }
-
-              StandardDropdown {
-                  Layout.preferredWidth: 200
-                  id: priorityDropdown
-                  Layout.topMargin: 5
-                  currentIndex: 0
-                  dataModel: priorityModelV5
-              }
-          }
-      }
+            }
+        }
 
       MoneroComponents.WarningBox {
           text: qsTr("Description field contents match long payment ID format. \
@@ -492,21 +802,21 @@ Rectangle {
               rightIconInactive: "qrc:///images/rightArrowInactive.png"
               Layout.topMargin: 4
               text: qsTr("Send") + translationManager.emptyString
-              enabled: !sendButtonWarningBox.visible && !warningContent && addressLine.text && !paymentIdWarningBox.visible
+              enabled: !sendButtonWarningBox.visible && !warningContent && !recipientModel.hasEmptyAddress() && !paymentIdWarningBox.visible
               onClicked: {
                   console.log("Transfer: paymentClicked")
                   var priority = priorityModelV5.get(priorityDropdown.currentIndex).priority
                   console.log("priority: " + priority)
-                  console.log("amount: " + amountLine.text)
-                  addressLine.text = addressLine.text.trim()
                   setPaymentId(paymentIdLine.text.trim());
-                  root.paymentClicked(addressLine.text, paymentIdLine.text, amountLine.text, root.mixin, priority, descriptionLine.text)
+                  root.paymentClicked(recipientModel.getRecipients(), paymentIdLine.text, root.mixin, priority, descriptionLine.text)
               }
           }
       }
 
-      function checkInformation(amount, address, nettype) {
-        return amount.length > 0 && walletManager.amountFromString(amountLine.text) <= appWindow.getUnlockedBalance() && TxUtils.checkAddress(address, nettype)
+      function checkInformation() {
+        return !recipientModel.hasEmptyAmount() &&
+            recipientModel.getAmountTotal() <= appWindow.getUnlockedBalance() &&
+            !recipientModel.hasInvalidAddress();
       }
 
     } // pageRoot
@@ -553,7 +863,8 @@ Rectangle {
                 if (appWindow.viewOnly && !appWindow.isTrustedDaemon()){
                     errorMessage = "<p class='orange'>" + qsTr("* To import, you must connect to a local node or a trusted remote node") + "</p>";
                 }
-                return "<style type='text/css'>p{line-height:20px; margin-top:0px; margin-bottom:0px; color:#ffffff;} p.orange{color:#ff9323;}</style>" +
+                return "<style type='text/css'>p{line-height:20px; margin-top:0px; margin-bottom:0px; color:" + MoneroComponents.Style.defaultFontColor +
+                       ";} p.orange{color:#ff9323;}</style>" +
                        "<p>" + qsTr("1. Using cold wallet, export the key images into a file") + "</p>" +
                        "<p>" + qsTr("2. Using view-only wallet, import the key images file") + "</p>" +
                        errorMessage + translationManager.emptyString
@@ -565,15 +876,13 @@ Rectangle {
             visible: persistentSettings.transferShowAdvanced && appWindow.walletMode >= 2
             title: qsTr("Offline transaction signing") + translationManager.emptyString
             button1.text: qsTr("Create") + translationManager.emptyString
-            button1.enabled: appWindow.viewOnly && pageRoot.checkInformation(amountLine.text, addressLine.text, appWindow.persistentSettings.nettype)
+            button1.enabled: appWindow.viewOnly && pageRoot.checkInformation()
             button1.onClicked: {
                 console.log("Transfer: saveTx Clicked")
                 var priority = priorityModelV5.get(priorityDropdown.currentIndex).priority
                 console.log("priority: " + priority)
-                console.log("amount: " + amountLine.text)
-                addressLine.text = addressLine.text.trim()
                 setPaymentId(paymentIdLine.text.trim());
-                root.paymentClicked(addressLine.text, paymentIdLine.text, amountLine.text, root.mixin, priority, descriptionLine.text)
+                root.paymentClicked(recipientModel.getRecipients(), paymentIdLine.text, root.mixin, priority, descriptionLine.text)
             }
             button2.text: qsTr("Sign (offline)") + translationManager.emptyString
             button2.enabled: !appWindow.viewOnly
@@ -590,10 +899,11 @@ Rectangle {
             helpTextLarge.text: qsTr("Spend XMR from a cold (offline) wallet") + translationManager.emptyString
             helpTextSmall.text: {
                 var errorMessage = "";
-                if (appWindow.viewOnly && !pageRoot.checkInformation(amountLine.text, addressLine.text, appWindow.persistentSettings.nettype)){
+                if (appWindow.viewOnly && !pageRoot.checkInformation()) {
                     errorMessage = "<p class='orange'>" + qsTr("* To create a transaction file, please enter address and amount above") + "</p>";
                 }
-                return "<style type='text/css'>p{line-height:20px; margin-top:0px; margin-bottom:0px; color:#ffffff;} p.orange{color:#ff9323;}</style>" +
+                return "<style type='text/css'>p{line-height:20px; margin-top:0px; margin-bottom:0px; color:" + MoneroComponents.Style.defaultFontColor + 
+                       ";} p.orange{color:#ff9323;}</style>" +
                        "<p>" + qsTr("1. Using view-only wallet, export the outputs into a file") + "</p>" +
                        "<p>" + qsTr("2. Using cold wallet, import the outputs file and export the key images") + "</p>" +
                        "<p>" + qsTr("3. Using view-only wallet, import the key images file and create a transaction file") + "</p>" +
@@ -621,7 +931,7 @@ Rectangle {
     FileDialog {
         id: signTxDialog
         title: qsTr("Please choose a file") + translationManager.emptyString
-        folder: "file://" +moneroAccountsDir
+        folder: "file://" + appWindow.accountsDir
         nameFilters: [ "Unsigned transfers (*)"]
 
         onAccepted: {
@@ -682,7 +992,7 @@ Rectangle {
     FileDialog {
         id: submitTxDialog
         title: qsTr("Please choose a file") + translationManager.emptyString
-        folder: "file://" +moneroAccountsDir
+        folder: "file://" + appWindow.accountsDir
         nameFilters: [ "signed transfers (*)"]
 
         onAccepted: {
@@ -790,19 +1100,9 @@ Rectangle {
     }
 
     // Popuplate fields from addressbook.
-    function sendTo(address, paymentId, description, amount){
+    function sendTo(address, paymentId, description, amount) {
         middlePanel.state = 'Transfer';
 
-        if(typeof address !== 'undefined')
-            addressLine.text = address
-
-        if(typeof paymentId !== 'undefined')
-            setPaymentId(paymentId);
-
-        if(typeof description !== 'undefined')
-            setDescription(description);
-
-        if(typeof amount !== 'undefined')
-            amountLine.text = amount;
+        fillPaymentDetails(address, paymentId, amount, description);
     }
 }

pages/TxKey.qml

@@ -46,7 +46,7 @@ Rectangle {
     ColumnLayout {
         id: mainLayout
         anchors.margins: 20
-        anchors.topMargin: 40
+        anchors.topMargin: 0
         anchors.left: parent.left
         anchors.top: parent.top
         anchors.right: parent.right

pages/merchant/MerchantTrackingList.qml

@@ -47,7 +47,7 @@ ListView {
         id: trackingTableItem
         visible: trackingListView.message === ""
         height: 53
-        width: parent.width
+        width: parent ? parent.width : undefined
         Layout.fillWidth: true
 
         RowLayout {

pages/settings/Navbar.qml

@@ -1,423 +0,0 @@
-// Copyright (c) 2014-2018, 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
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.2
-import "../../js/Windows.js" as Windows
-import "../../js/Utils.js" as Utils
-import "../../components" as MoneroComponents
-import "../../pages"
-import "."
-import moneroComponents.Clipboard 1.0
-
-Rectangle {
-    Layout.fillWidth: true
-    Layout.preferredHeight: 96
-    color: "transparent"
-
-    ColumnLayout {
-        spacing: 0
-        Layout.preferredHeight: 32
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.horizontalCenter: parent.horizontalCenter
-
-        GridLayout {
-            id: grid
-            Layout.alignment: Qt.AlignHCenter
-            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
-                property bool isActive: settingsStateView.state === "Wallet"
-                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: navBarLeft.isActive ? grid.borderColor : "transparent"
-                    }
-
-                    Rectangle {
-                        color: grid.borderColor
-                        Layout.preferredHeight: 1
-                        Layout.preferredWidth: 1
-                    }
-                }
-            }
-
-            ColumnLayout {
-                // WALLET
-                id: navWallet
-                property bool isActive: settingsStateView.state === "Wallet"
-                Layout.preferredWidth: navWalletText.width + grid.textMargin
-                Layout.minimumWidth: 72
-                Layout.preferredHeight: 32
-                spacing: 0
-
-                Rectangle { 
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.fillWidth: true
-                }
-
-                Rectangle {
-                    color: parent.isActive ? grid.borderColor : "transparent"
-                    height: 30
-                    Layout.fillWidth: true
-
-                    MoneroComponents.TextPlain {
-                        id: navWalletText
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        anchors.verticalCenter: parent.verticalCenter
-                        font.family: grid.fontFamily
-                        font.pixelSize: grid.fontSize
-                        font.bold: grid.fontBold
-                        text: qsTr("Wallet") + translationManager.emptyString
-                        color: navWallet.isActive ? grid.fontColorActive : grid.fontColorInActive
-                        themeTransition: false
-                    }
-
-                    MouseArea {
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-
-                        onClicked: { settingsStateView.state = "Wallet" }
-                    }
-                }
-
-                Rectangle { 
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.fillWidth: true
-                }
-            }
-            Rectangle{
-                Layout.preferredWidth: 1
-                Layout.preferredHeight: 32
-                color: grid.borderColor
-            }
-            ColumnLayout {
-                // UI
-                id: navUI
-                property bool isActive: settingsStateView.state === "UI"
-                Layout.preferredWidth: navUIText.width + grid.textMargin
-                Layout.preferredHeight: 32
-                Layout.minimumWidth: 72
-                spacing: 0
-
-                Rectangle { 
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.fillWidth: true
-                }
-
-                Rectangle {
-                    color: parent.isActive ? grid.borderColor : "transparent"
-                    height: 30
-                    Layout.fillWidth: true
-
-                    MoneroComponents.TextPlain {
-                        id: navUIText
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        anchors.verticalCenter: parent.verticalCenter
-                        font.family: grid.fontFamily
-                        font.pixelSize: grid.fontSize
-                        font.bold: grid.fontBold
-                        text: qsTr("Interface") + translationManager.emptyString
-                        color: navUI.isActive ? grid.fontColorActive : grid.fontColorInActive
-                        themeTransition: false
-                    }
-
-                    MouseArea {
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-
-                        onClicked: { settingsStateView.state = "UI" }
-                    }
-                }
-
-                Rectangle { 
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.fillWidth: true
-                }
-            }
-            Rectangle{
-                Layout.preferredWidth: 1
-                Layout.preferredHeight: 32
-                color: grid.borderColor
-            }
-            ColumnLayout {
-                // NODE
-                id: navNode
-                property bool isActive: settingsStateView.state === "Node"
-                visible: appWindow.walletMode >= 2
-                Layout.preferredWidth: navNodeText.width + grid.textMargin
-                Layout.preferredHeight: 32
-                Layout.minimumWidth: 72
-                spacing: 0
-
-                Rectangle { 
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.fillWidth: true
-                }
-
-                Rectangle {
-                    color: parent.isActive ? grid.borderColor : "transparent"
-                    height: 30
-                    Layout.fillWidth: true
-
-                    MoneroComponents.TextPlain {
-                        id: navNodeText
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        anchors.verticalCenter: parent.verticalCenter
-                        font.family: grid.fontFamily
-                        font.pixelSize: grid.fontSize
-                        font.bold: grid.fontBold
-                        text: qsTr("Node") + translationManager.emptyString
-                        color: navNode.isActive ? grid.fontColorActive : grid.fontColorInActive
-                        themeTransition: false
-                    }
-
-                    MouseArea {
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-
-                        onClicked: { settingsStateView.state = "Node" }
-                    }
-                }
-
-                Rectangle { 
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.fillWidth: true
-                }
-            }
-            Rectangle{
-                visible: appWindow.walletMode >= 2
-                Layout.preferredWidth: 1
-                Layout.preferredHeight: 32
-                color: grid.borderColor
-            }
-            ColumnLayout {
-                // LOG
-                id: navLog
-                property bool isActive: settingsStateView.state === "Log"
-                Layout.preferredWidth: navLogText.width + grid.textMargin
-                Layout.preferredHeight: 32
-                Layout.minimumWidth: 72
-                spacing: 0
-
-                Rectangle { 
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.fillWidth: true
-                }
-
-                Rectangle {
-                    color: parent.isActive ? grid.borderColor : "transparent"
-                    height: 30
-                    Layout.fillWidth: true
-
-                    MoneroComponents.TextPlain {
-                        id: navLogText
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        anchors.verticalCenter: parent.verticalCenter
-                        font.family: grid.fontFamily
-                        font.pixelSize: grid.fontSize
-                        font.bold: grid.fontBold
-                        text: qsTr("Log") + translationManager.emptyString
-                        color: navLog.isActive ? grid.fontColorActive : grid.fontColorInActive
-                        themeTransition: false
-                    }
-
-                    MouseArea {
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-
-                        onClicked: { settingsStateView.state = "Log" }
-                    }
-                }
-
-                Rectangle { 
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.fillWidth: true
-                }
-            }
-            Rectangle{
-                visible: appWindow.walletMode >= 2
-                Layout.preferredWidth: 1
-                Layout.preferredHeight: 32
-                color: grid.borderColor
-            }
-            ColumnLayout {
-                // INFO
-                id: navInfo
-                property bool isActive: settingsStateView.state === "Info"
-                Layout.preferredWidth: navInfoText.width + grid.textMargin
-                Layout.preferredHeight: 32
-                Layout.minimumWidth: 72
-                spacing: 0
-
-                Rectangle { 
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.fillWidth: true
-                }
-
-                Rectangle {
-                    color: parent.isActive ? grid.borderColor : "transparent"
-                    height: 30
-                    Layout.fillWidth: true
-
-                    MoneroComponents.TextPlain {
-                        id: navInfoText
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        anchors.verticalCenter: parent.verticalCenter
-                        font.family: grid.fontFamily
-                        font.pixelSize: grid.fontSize
-                        font.bold: grid.fontBold
-                        text: qsTr("Info") + translationManager.emptyString
-                        color: navInfo.isActive ? grid.fontColorActive : grid.fontColorInActive
-                        themeTransition: false
-                    }
-
-                    MouseArea {
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-
-                        onClicked: { settingsStateView.state = "Info" }
-                    }
-                }
-
-                Rectangle { 
-                    color: grid.borderColor
-                    Layout.preferredHeight: 1
-                    Layout.fillWidth: true
-                }
-            }
-
-            Rectangle {
-                // navbar right side border
-                id: navBarRight
-                property bool isActive: settingsStateView.state === "Info"
-                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: navBarRight.isActive ? grid.borderColor : "transparent"
-                    }
-
-                    Rectangle {
-                        color: grid.borderColor
-                        Layout.preferredHeight: 1
-                        Layout.preferredWidth: 1
-                    }
-                }
-            }
-
-            Rectangle {
-                color: "transparent"
-                Layout.fillWidth: true
-            }
-        }
-    }
-}

pages/settings/Settings.qml

@@ -48,7 +48,38 @@ ColumnLayout {
     property int settingsHeight: 900
     property alias settingsStateViewState: settingsStateView.state
 
-    Navbar{}
+    MoneroComponents.Navbar {
+        Layout.alignment: Qt.AlignHCenter
+        Layout.topMargin: height
+        Layout.bottomMargin: height
+
+        MoneroComponents.NavbarItem {
+            active: settingsStateView.state == "Wallet"
+            text: qsTr("Wallet") + translationManager.emptyString
+            onSelected: settingsStateView.state = "Wallet"
+        }
+        MoneroComponents.NavbarItem {
+            active: settingsStateView.state == "UI"
+            text: qsTr("Interface") + translationManager.emptyString
+            onSelected: settingsStateView.state = "UI"
+        }
+        MoneroComponents.NavbarItem {
+            active: settingsStateView.state == "Node"
+            text: qsTr("Node") + translationManager.emptyString
+            visible: appWindow.walletMode >= 2
+            onSelected: settingsStateView.state = "Node"
+        }
+        MoneroComponents.NavbarItem {
+            active: settingsStateView.state == "Log"
+            text: qsTr("Log") + translationManager.emptyString
+            onSelected: settingsStateView.state = "Log"
+        }
+        MoneroComponents.NavbarItem {
+            active: settingsStateView.state == "Info"
+            text: qsTr("Info") + translationManager.emptyString
+            onSelected: settingsStateView.state = "Info"
+        }
+    }
 
     Rectangle{
         id: settingsStateView

pages/settings/SettingsInfo.qml

@@ -47,7 +47,7 @@ Rectangle {
         } else if(appWindow.walletMode === 1){
           return qsTr("Simple mode") + " (bootstrap)" + translationManager.emptyString;
         } else if(appWindow.walletMode === 2){
-          return qsTr("Advanced mode") + translationManager.emptyString;
+          return "%1 (%2)".arg(qsTr("Advanced mode")).arg(persistentSettings.useRemoteNode ? qsTr("Remote node") : qsTr("Local node")) + translationManager.emptyString;
         }
     }
 
@@ -135,7 +135,7 @@ Rectangle {
                 Layout.fillWidth: true
                 color: MoneroComponents.Style.dimmedFontColor
                 font.pixelSize: 14
-                property string walletPath: (isIOS ?  moneroAccountsDir : "") + persistentSettings.wallet_path
+                property string walletPath: (isIOS ?  appWindow.accountsDir : "") + persistentSettings.wallet_path
                 text: "\
                     <style type='text/css'>\
                         a {cursor:pointer;text-decoration: none; color: #FF6C3C}\
@@ -272,9 +272,9 @@ Rectangle {
                     <style type='text/css'>\
                         a {cursor:pointer;text-decoration: none; color: #FF6C3C}\
                     </style>\
-                    <a href='#'>%1</a>".arg(walletLogPath)
+                    <a href='#'>%1</a>".arg(logger.logFilePath)
                 textFormat: Text.RichText
-                onLinkActivated: oshelper.openContainingFolder(walletLogPath)
+                onLinkActivated: oshelper.openContainingFolder(logger.logFilePath)
 
                 MouseArea {
                     anchors.fill: parent
@@ -393,13 +393,15 @@ Rectangle {
                     data += "\nEmbedded Monero version: " + moneroVersion;
                     data += "\nWallet path: " + walletLocation.walletPath;
 
-                    data += "\nWallet creation height: ";
+                    data += "\nWallet restore height: ";
                     if(currentWallet)
                         data += currentWallet.walletCreationHeight;
 
-                    data += "\nWallet log path: " + walletLogPath;
+                    data += "\nWallet log path: " + logger.logFilePath;
                     data += "\nWallet mode: " + walletModeString;
-                    data += "\nGraphics: " + isOpenGL ? "OpenGL" : "Low graphics mode";
+                    data += "\nGraphics mode: " + isOpenGL ? "OpenGL" : "Low graphics mode";
+                    if (isTails)
+                        data += "\nTails: " + tailsUsePersistence ? "persistent" : "persistence disabled";
 
                     console.log("Copied to clipboard");
                     clipboard.setText(data);

pages/settings/SettingsLayout.qml

@@ -66,6 +66,12 @@ Rectangle {
             text: qsTr("Check for updates periodically") + translationManager.emptyString
         }
 
+        MoneroComponents.CheckBox {
+            checked: persistentSettings.displayWalletNameInTitleBar
+            onClicked: persistentSettings.displayWalletNameInTitleBar = !persistentSettings.displayWalletNameInTitleBar
+            text: qsTr("Display wallet name in title bar") + translationManager.emptyString
+        }
+
         MoneroComponents.CheckBox {
             id: hideBalanceCheckBox
             checked: persistentSettings.hideBalance
@@ -251,6 +257,37 @@ Rectangle {
             }
         }
 
+        MoneroComponents.CheckBox {
+            id: proxyCheckbox
+            Layout.topMargin: 6
+            enabled: !socksProxyFlagSet
+            checked: socksProxyFlagSet ? socksProxyFlag : persistentSettings.proxyEnabled
+            onClicked: {
+                persistentSettings.proxyEnabled = !persistentSettings.proxyEnabled;
+            }
+            text: qsTr("Socks5 proxy (%1%2)")
+                .arg(appWindow.walletMode >= 2 ? qsTr("remote node connections, ") : "")
+                .arg(qsTr("updates downloading, fetching price sources")) + translationManager.emptyString
+        }
+
+        MoneroComponents.RemoteNodeEdit {
+            id: proxyEdit
+            enabled: proxyCheckbox.enabled
+            Layout.leftMargin: 36
+            Layout.topMargin: 6
+            Layout.minimumWidth: 100
+            placeholderFontSize: 15
+            visible: proxyCheckbox.checked
+
+            daemonAddrLabelText: qsTr("IP address") + translationManager.emptyString
+            daemonPortLabelText: qsTr("Port") + translationManager.emptyString
+
+            initialAddress: socksProxyFlagSet ? socksProxyFlag : persistentSettings.proxyAddress
+            onEditingFinished: {
+                persistentSettings.proxyAddress = proxyEdit.getAddress();
+            }
+        }
+
         MoneroComponents.StandardButton {
             visible: !persistentSettings.customDecorations
             Layout.topMargin: 10

pages/settings/SettingsLog.qml

@@ -215,6 +215,7 @@ Rectangle {
             Layout.fillWidth: true
             property var lastCommands: []
             property int currentCommandIndex
+            enabled: !persistentSettings.useRemoteNode
             fontBold: false
             placeholderText: qsTr("command + enter (e.g 'help' or 'status')") + translationManager.emptyString
             placeholderFontSize: 16

pages/settings/SettingsNode.qml

@@ -130,12 +130,13 @@ Rectangle{
                     topPadding: 0
                     text: qsTr("The blockchain is downloaded to your computer. Provides higher security and requires more local storage.") + translationManager.emptyString
                     width: parent.width - (localNodeIcon.width + localNodeIcon.anchors.leftMargin + anchors.leftMargin)
-                }   
+                }
             }
 
             MouseArea {
                 cursorShape: Qt.PointingHandCursor
                 anchors.fill: parent
+                enabled: persistentSettings.useRemoteNode
                 onClicked: {
                     persistentSettings.useRemoteNode = false;
                     appWindow.disconnectRemoteNode();
@@ -227,6 +228,7 @@ Rectangle{
                 MouseArea {
                     cursorShape: Qt.PointingHandCursor
                     anchors.fill: parent
+                    enabled: !persistentSettings.useRemoteNode
                     onClicked: {
                         appWindow.connectRemoteNode();
                     }
@@ -260,80 +262,94 @@ Rectangle{
                 text: qsTr("To find a remote node, type 'Monero remote node' into your favorite search engine. Please ensure the node is run by a trusted third-party.") + translationManager.emptyString
             }
 
-            MoneroComponents.RemoteNodeEdit {
-                id: remoteNodeEdit
-                Layout.minimumWidth: 100
-                placeholderFontSize: 15
-
-                daemonAddrLabelText: qsTr("Address") + translationManager.emptyString
-                daemonPortLabelText: qsTr("Port") + translationManager.emptyString
-
-                initialAddress: persistentSettings.remoteNodeAddress
-                onEditingFinished: {
-                    persistentSettings.remoteNodeAddress = remoteNodeEdit.getAddress();
-                    console.log("setting remote node to " + persistentSettings.remoteNodeAddress);
-                    if (persistentSettings.is_trusted_daemon) {
-                        persistentSettings.is_trusted_daemon = !persistentSettings.is_trusted_daemon
-                        currentWallet.setTrustedDaemon(persistentSettings.is_trusted_daemon)
-                        setTrustedDaemonCheckBox.checked = !setTrustedDaemonCheckBox.checked
-                        appWindow.showStatusMessage(qsTr("Remote node updated. Trusted daemon has been reset. Mark again, if desired."), 8);
-                    }
-                }
-            }
-
-            GridLayout {
-                columns: 2
-                columnSpacing: 32
-
-                MoneroComponents.LineEdit {
-                    id: daemonUsername
-                    Layout.fillWidth: true
-                    labelText: qsTr("Daemon username") + translationManager.emptyString
-                    text: persistentSettings.daemonUsername
-                    placeholderText: qsTr("(optional)") + translationManager.emptyString
-                    placeholderFontSize: 15
-                    labelFontSize: 14
-                    fontSize: 15
-                }
-
-                MoneroComponents.LineEdit {
-                    id: daemonPassword
-                    Layout.fillWidth: true
-                    labelText: qsTr("Daemon password") + translationManager.emptyString
-                    text: persistentSettings.daemonPassword
-                    placeholderText: qsTr("Password") + translationManager.emptyString
-                    password: true
-                    placeholderFontSize: 15
-                    labelFontSize: 14
-                    fontSize: 15
-                }
-            }
-
             MoneroComponents.CheckBox {
-                id: setTrustedDaemonCheckBox
-                checked: persistentSettings.is_trusted_daemon
-                onClicked: {
-                    persistentSettings.is_trusted_daemon = !persistentSettings.is_trusted_daemon
-                    currentWallet.setTrustedDaemon(persistentSettings.is_trusted_daemon)
-                }
-                text: qsTr("Mark as Trusted Daemon") + translationManager.emptyString
+                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)
             }
 
-            MoneroComponents.StandardButton {
-                id: btnConnectRemote
-                enabled: remoteNodeEdit.isValid()
-                small: true
-                text: qsTr("Connect") + translationManager.emptyString
-                onClicked: {
-                    // Update daemon login
-                    persistentSettings.remoteNodeAddress = remoteNodeEdit.getAddress();
-                    persistentSettings.daemonUsername = daemonUsername.text;
-                    persistentSettings.daemonPassword = daemonPassword.text;
-                    persistentSettings.useRemoteNode = true
+            ColumnLayout {
+                spacing: 0
 
-                    currentWallet.setDaemonLogin(persistentSettings.daemonUsername, persistentSettings.daemonPassword);
+                Repeater {
+                    model: remoteNodesModel
 
-                    appWindow.connectRemoteNode()
+                    Rectangle {
+                        height: 30
+                        Layout.fillWidth: true
+                        color: itemMouseArea.containsMouse || index === remoteNodesModel.selected ? MoneroComponents.Style.titleBarButtonHoverColor : "transparent"
+
+                        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"
+
+                            MoneroComponents.TextPlain {
+                                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
+                            }
+
+                            MouseArea {
+                                id: itemMouseArea
+                                cursorShape: Qt.PointingHandCursor
+                                anchors.fill: parent
+                                hoverEnabled: true
+                                onClicked: remoteNodesModel.applyRemoteNode(index)
+                            }
+                        }
+
+                        RowLayout {
+                            anchors.verticalCenter: parent.verticalCenter
+                            anchors.right: parent.right
+                            anchors.rightMargin: 6
+                            height: 30
+                            spacing: 10
+
+                            MoneroComponents.InlineButton {
+                                buttonColor: "transparent"
+                                fontFamily: FontAwesome.fontFamily
+                                fontPixelSize: 18
+                                text: FontAwesome.edit
+                                onClicked: remoteNodeDialog.edit(remoteNodesModel.get(index), function (remoteNode) {
+                                    remoteNodesModel.set(index, remoteNode)
+                                })
+                            }
+
+                            MoneroComponents.InlineButton {
+                                buttonColor: "transparent"
+                                fontFamily: FontAwesome.fontFamily
+                                text: FontAwesome.times
+                                visible: remoteNodesModel.count > 1
+                                onClicked: remoteNodesModel.removeSelectNextIfNeeded(index)
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -396,7 +412,7 @@ Rectangle{
                 placeholderFontSize: 15
                 text: persistentSettings.daemonFlags
                 addressValidation: false
-                error: text.match(/(^|\s)--(data-dir|bootstrap-daemon-address)/)
+                error: text.match(/(^|\s)--(data-dir|bootstrap-daemon-address|non-interactive)/)
                 onEditingFinished: {
                     if (!daemonFlags.error) {
                         persistentSettings.daemonFlags = daemonFlags.text;
@@ -429,7 +445,7 @@ Rectangle{
                     }
                 }
             }
-        } 
+        }
     }
 }
 

pages/settings/SettingsWallet.qml

@@ -62,7 +62,7 @@ Rectangle {
             iconText: FontAwesome.eye
             description: qsTr("Creates a new wallet that can only view and initiate transactions, but requires a spendable wallet to sign transactions before sending.") + translationManager.emptyString
             title: qsTr("Create a view-only wallet") + translationManager.emptyString
-            visible: !appWindow.viewOnly
+            visible: !appWindow.viewOnly && (currentWallet ? !currentWallet.isLedger() : true)
 
             onClicked: {
                 var newPath = currentWallet.path + "_viewonly";

qml.qrc

@@ -3,7 +3,12 @@
         <file>main.qml</file>
         <file>LeftPanel.qml</file>
         <file>MiddlePanel.qml</file>
+        <file>components/Dialog.qml</file>
         <file>components/Label.qml</file>
+        <file>components/LanguageButton.qml</file>
+        <file>components/Navbar.qml</file>
+        <file>components/NavbarItem.qml</file>
+        <file>components/RemoteNodeDialog.qml</file>
         <file>components/SettingsListItem.qml</file>
         <file>components/Slider.qml</file>
         <file>components/UpdateDialog.qml</file>
@@ -14,6 +19,7 @@
         <file>monero/utils/gpg_keys/fluffypony.asc</file>
         <file>monero/utils/gpg_keys/luigi1111.asc</file>
         <file>pages/Account.qml</file>
+        <file>pages/Advanced.qml</file>
         <file>pages/Transfer.qml</file>
         <file>pages/History.qml</file>
         <file>pages/AddressBook.qml</file>
@@ -87,7 +93,6 @@
         <file>lang/flags/ua.png</file>
         <file>lang/flags/gb.png</file>
         <file>lang/flags/us.png</file>
-        <file>lang/flags/pirate.png</file>
         <file>lang/flags/nb_NO.png</file>
         <file>pages/Receive.qml</file>
         <file>pages/TxKey.qml</file>
@@ -162,7 +167,6 @@
         <file>pages/settings/SettingsLog.qml</file>
         <file>pages/settings/SettingsLayout.qml</file>
         <file>pages/settings/SettingsInfo.qml</file>
-        <file>pages/settings/Navbar.qml</file>
         <file>components/WarningBox.qml</file>
         <file>images/miningxmr.png</file>
         <file>images/miningxmr@2x.png</file>
@@ -241,5 +245,9 @@
         <file>components/AdvancedOptionsItem.qml</file>
         <file>images/busy-indicator.png</file>
         <file>images/busy-indicator@2x.png</file>
+        <file>images/success.png</file>
+        <file>images/success@2x.png</file>
+        <file>components/SuccessfulTxDialog.qml</file>
+        <file>components/TxConfirmationDialog.qml</file>
     </qresource>
 </RCC>

src/CMakeLists.txt

@@ -1,4 +1,3 @@
-add_subdirectory(QR-Code-generator)
 add_subdirectory(QR-Code-scanner)
 add_subdirectory(daemon)
 add_subdirectory(libwalletqt)
@@ -21,10 +20,7 @@ file(GLOB SOURCE_FILES
     "libwalletqt/PendingTransaction.cpp"
     "libwalletqt/TransactionHistory.cpp"
     "libwalletqt/TransactionInfo.cpp"
-    "libwalletqt/QRCodeImageProvider.cpp" QR
-    "QR-Code-generator/BitBuffer.cpp"
-    "QR-Code-generator/QrCode.cpp"
-    "QR-Code-generator/QrSegment.cpp"
+    "libwalletqt/QRCodeImageProvider.cpp"
     "libwalletqt/AddressBook.cpp"
     "libwalletqt/Subaddress.cpp"
     "libwalletqt/SubaddressAccount.cpp"
@@ -36,9 +32,6 @@ file(GLOB SOURCE_FILES
     "libwalletqt/TransactionHistory.h"
     "libwalletqt/TransactionInfo.h"
     "libwalletqt/QRCodeImageProvider.h"
-    "QR-Code-generator/BitBuffer.h"
-    "QR-Code-generator/QrCode.h"
-    "QR-Code-generator/QrSegment.h"
     "libwalletqt/Transfer.h"
     "libwalletqt/AddressBook.h"
     "libwalletqt/Subaddress.h"
@@ -62,15 +55,6 @@ if(ENABLE_PASS_STRENGTH_METER)
     )
 endif()
 
-if(WITH_SCANNER)
-    file(GLOB QR_CODE_FILES
-        "QR-Code-generator/*.h"
-    	"QR-Code-generator/*.cpp"
-    	"QR-Code-scanner/*.h"
-    	"QR-Code-scanner/*.cpp"
-    )
-endif()
-
 set(EXECUTABLE_FLAG)
 if(MINGW)
     set(EXECUTABLE_FLAG WIN32)
@@ -79,7 +63,8 @@ if(MINGW)
     set(ICON_RC ${CMAKE_CURRENT_BINARY_DIR}/icon.rc)
     set(ICON_RES ${CMAKE_CURRENT_BINARY_DIR}/icon.o)
     file(WRITE ${ICON_RC} "IDI_ICON1 ICON DISCARDABLE \"${ICON}\"")
-    add_custom_command(OUTPUT ${ICON_RES} COMMAND windres ${ICON_RC} ${ICON_RES} MAIN_DEPENDENCY ${ICON_RC})
+    find_program(Qt5_WINDRES_EXECUTABLE NAMES windres x86_64-w64-mingw32-windres REQUIRED CMAKE_FIND_ROOT_PATH_BOTH)
+    add_custom_command(OUTPUT ${ICON_RES} COMMAND ${Qt5_WINDRES_EXECUTABLE} ${ICON_RC} ${ICON_RES} MAIN_DEPENDENCY ${ICON_RC})
     list(APPEND RESOURCES ${ICON_RES})
 endif()
 
@@ -89,13 +74,19 @@ if(APPLE)
     list(APPEND RESOURCES ${ICON})
 endif()
 
-add_executable(monero-wallet-gui ${EXECUTABLE_FLAG} main/main.cpp
+set(monero_wallet_gui_sources
     ${SOURCE_FILES}
     ${PASS_STRENGTH_FILES}
-    ${QR_CODE_FILES}
     ${RESOURCES}
 )
 
+if(NOT ANDROID)
+    add_executable(monero-wallet-gui ${EXECUTABLE_FLAG} ${monero_wallet_gui_sources})
+else()
+    add_library(monero-wallet-gui SHARED ${monero_wallet_gui_sources})
+    set_target_properties(monero-wallet-gui PROPERTIES COMPILE_DEFINITIONS "ANDROID")
+endif()
+
 set_target_properties(monero-wallet-gui PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
     MACOSX_BUNDLE TRUE
@@ -117,11 +108,11 @@ target_include_directories(monero-wallet-gui PUBLIC
     ${CMAKE_SOURCE_DIR}/monero/src
     ${CMAKE_SOURCE_DIR}/monero/external/easylogging++
     ${CMAKE_SOURCE_DIR}/monero/contrib/epee/include
+    ${CMAKE_SOURCE_DIR}/monero/external/qrcodegen
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/daemon
 	${CMAKE_CURRENT_SOURCE_DIR}/libwalletqt
 	${CMAKE_CURRENT_SOURCE_DIR}/model
-	${CMAKE_CURRENT_SOURCE_DIR}/QR-Code-generator
 	${CMAKE_CURRENT_SOURCE_DIR}/QR-Code-scanner
 	${CMAKE_CURRENT_SOURCE_DIR}/zxcvbn-c
     ${LibUSB_INCLUDE_DIRS}
@@ -129,7 +120,6 @@ target_include_directories(monero-wallet-gui PUBLIC
     ${X11_INCLUDE_DIR}
     ${Boost_INCLUDE_DIRS}
     ${OPENSSL_INCLUDE_DIR}
-    ${ZBAR_INCLUDE_DIR}
 )
 
 target_compile_definitions(monero-wallet-gui
@@ -138,12 +128,21 @@ target_compile_definitions(monero-wallet-gui
     ${Qt5Qml_DEFINITIONS}
 )
 
+if(APPLE)
+    if(NOT ICU_ROOT)
+        execute_process(COMMAND brew --prefix icu4c OUTPUT_VARIABLE ICU_ROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
+    endif()
+    find_package(ICU REQUIRED COMPONENTS data i18n uc)
+    target_link_directories(monero-wallet-gui PRIVATE ${ICU_ROOT}/lib)
+endif()
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 
 target_link_libraries(monero-wallet-gui
     wallet_merged
     ${LMDB_LIBRARY}
     epee
+    qrcodegen
     ${UNBOUND_LIBRARY}
     ${SODIUM_LIBRARY}
     easylogging
@@ -159,6 +158,7 @@ target_link_libraries(monero-wallet-gui
     ${EXTRA_LIBRARIES}
     ${ICU_LIBRARIES}
     openpgp
+    qrdecoder
     translations
 )
 
@@ -171,15 +171,21 @@ if(X11_FOUND)
 endif()
 
 if(WITH_SCANNER)
-    target_link_libraries(monero-wallet-gui
-        ${ZBAR_LIBRARIES}
-        jpeg
-        v4l2
-        v4lconvert
-        rt
-    )
+    target_link_libraries(monero-wallet-gui qrscanner)
+    if(LINUX AND NOT ANDROID)
+        target_link_libraries(monero-wallet-gui
+            jpeg
+            v4l2
+            v4lconvert
+            rt
+        )
+    endif()
 endif()
 
+add_custom_command(TARGET monero-wallet-gui POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:daemon> $<TARGET_FILE_DIR:monero-wallet-gui>)
+
+include(Deploy)
+
 install(TARGETS monero-wallet-gui
-    DESTINATION ${CMAKE_INSTALL_PREFIX}
+    DESTINATION bin
 )

src/QR-Code-generator/BitBuffer.cpp

@@ -1,91 +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.
-
-/*
- * QR Code generator library (C++)
- * 
- * Copyright (c) 2016 Project Nayuki
- * https://www.nayuki.io/page/qr-code-generator-library
- * 
- * (MIT License)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * - The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- * - The Software is provided "as is", without warranty of any kind, express or
- *   implied, including but not limited to the warranties of merchantability,
- *   fitness for a particular purpose and noninfringement. In no event shall the
- *   authors or copyright holders be liable for any claim, damages or other
- *   liability, whether in an action of contract, tort or otherwise, arising from,
- *   out of or in connection with the Software or the use or other dealings in the
- *   Software.
- */
-
-#include <cstddef>
-#include "BitBuffer.hpp"
-
-
-qrcodegen::BitBuffer::BitBuffer() :
-	data(),
-	bitLength(0) {}
-
-
-int qrcodegen::BitBuffer::getBitLength() const {
-	return bitLength;
-}
-
-
-std::vector<uint8_t> qrcodegen::BitBuffer::getBytes() const {
-	return data;
-}
-
-
-void qrcodegen::BitBuffer::appendBits(uint32_t val, int len) {
-	if (len < 0 || len > 32 || (len < 32 && (val >> len) != 0))
-		throw "Value out of range";
-	size_t newBitLen = bitLength + len;
-	while (data.size() * 8 < newBitLen)
-		data.push_back(0);
-	for (int i = len - 1; i >= 0; i--, bitLength++)  // Append bit by bit
-		data.at(bitLength >> 3) |= ((val >> i) & 1) << (7 - (bitLength & 7));
-}
-
-
-void qrcodegen::BitBuffer::appendData(const QrSegment &seg) {
-	size_t newBitLen = bitLength + seg.bitLength;
-	while (data.size() * 8 < newBitLen)
-		data.push_back(0);
-	for (int i = 0; i < seg.bitLength; i++, bitLength++) {  // Append bit by bit
-		int bit = (seg.data.at(i >> 3) >> (7 - (i & 7))) & 1;
-		data.at(bitLength >> 3) |= bit << (7 - (bitLength & 7));
-	}
-}

src/QR-Code-generator/BitBuffer.hpp

@@ -1,104 +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.
-
-/*
- * QR Code generator library (C++)
- * 
- * Copyright (c) 2016 Project Nayuki
- * https://www.nayuki.io/page/qr-code-generator-library
- * 
- * (MIT License)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * - The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- * - The Software is provided "as is", without warranty of any kind, express or
- *   implied, including but not limited to the warranties of merchantability,
- *   fitness for a particular purpose and noninfringement. In no event shall the
- *   authors or copyright holders be liable for any claim, damages or other
- *   liability, whether in an action of contract, tort or otherwise, arising from,
- *   out of or in connection with the Software or the use or other dealings in the
- *   Software.
- */
-
-#pragma once
-
-#include <cstdint>
-#include <vector>
-#include "QrSegment.hpp"
-
-
-namespace qrcodegen {
-
-/* 
- * An appendable sequence of bits. Bits are packed in big endian within a byte.
- */
-class BitBuffer final {
-	
-	/*---- Fields ----*/
-private:
-	
-	std::vector<uint8_t> data;
-	int bitLength;
-	
-	
-	
-	/*---- Constructor ----*/
-public:
-	
-	// Creates an empty bit buffer (length 0).
-	BitBuffer();
-	
-	
-	
-	/*---- Methods ----*/
-public:
-	
-	// Returns the number of bits in the buffer, which is a non-negative value.
-	int getBitLength() const;
-	
-	
-	// Returns a copy of all bytes, padding up to the nearest byte.
-	std::vector<uint8_t> getBytes() const;
-	
-	
-	// Appends the given number of bits of the given value to this sequence.
-	// If 0 <= len <= 31, then this requires 0 <= val < 2^len.
-	void appendBits(uint32_t val, int len);
-	
-	
-	// Appends the data of the given segment to this bit buffer.
-	void appendData(const QrSegment &seg);
-	
-};
-
-}

src/QR-Code-generator/CMakeLists.txt

@@ -1,4 +0,0 @@
-file(GLOB_RECURSE SRC_SOURCES *.cpp)
-file(GLOB_RECURSE SRC_HEADERS *.h)
-
-

src/QR-Code-generator/QrCode.cpp

@@ -1,644 +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.
-
-/*
- * QR Code generator library (C++)
- * 
- * Copyright (c) 2016 Project Nayuki
- * https://www.nayuki.io/page/qr-code-generator-library
- * 
- * (MIT License)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * - The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- * - The Software is provided "as is", without warranty of any kind, express or
- *   implied, including but not limited to the warranties of merchantability,
- *   fitness for a particular purpose and noninfringement. In no event shall the
- *   authors or copyright holders be liable for any claim, damages or other
- *   liability, whether in an action of contract, tort or otherwise, arising from,
- *   out of or in connection with the Software or the use or other dealings in the
- *   Software.
- */
-
-#include <algorithm>
-#include <climits>
-#include <cmath>
-#include <cstddef>
-#include <sstream>
-#include "BitBuffer.hpp"
-#include "QrCode.hpp"
-
-
-qrcodegen::QrCode::Ecc::Ecc(int ord, int fb) :
-	ordinal(ord),
-	formatBits(fb) {}
-
-
-const qrcodegen::QrCode::Ecc qrcodegen::QrCode::Ecc::LOW     (0, 1);
-const qrcodegen::QrCode::Ecc qrcodegen::QrCode::Ecc::MEDIUM  (1, 0);
-const qrcodegen::QrCode::Ecc qrcodegen::QrCode::Ecc::QUARTILE(2, 3);
-const qrcodegen::QrCode::Ecc qrcodegen::QrCode::Ecc::HIGH    (3, 2);
-
-
-qrcodegen::QrCode qrcodegen::QrCode::encodeText(const char *text, const Ecc &ecl) {
-	std::vector<QrSegment> segs(QrSegment::makeSegments(text));
-	return encodeSegments(segs, ecl);
-}
-
-
-qrcodegen::QrCode qrcodegen::QrCode::encodeBinary(const std::vector<uint8_t> &data, const Ecc &ecl) {
-	std::vector<QrSegment> segs;
-	segs.push_back(QrSegment::makeBytes(data));
-	return encodeSegments(segs, ecl);
-}
-
-
-qrcodegen::QrCode qrcodegen::QrCode::encodeSegments(const std::vector<QrSegment> &segs, const Ecc &ecl,
-		int minVersion, int maxVersion, int mask, bool boostEcl) {
-	if (!(1 <= minVersion && minVersion <= maxVersion && maxVersion <= 40) || mask < -1 || mask > 7)
-		throw "Invalid value";
-	
-	// Find the minimal version number to use
-	int version, dataUsedBits;
-	for (version = minVersion; ; version++) {
-		int dataCapacityBits = getNumDataCodewords(version, ecl) * 8;  // Number of data bits available
-		dataUsedBits = QrSegment::getTotalBits(segs, version);
-		if (dataUsedBits != -1 && dataUsedBits <= dataCapacityBits)
-			break;  // This version number is found to be suitable
-		if (version >= maxVersion)  // All versions in the range could not fit the given data
-			throw "Data too long";
-	}
-	if (dataUsedBits == -1)
-		throw "Assertion error";
-	
-	// Increase the error correction level while the data still fits in the current version number
-	const Ecc *newEcl = &ecl;
-	if (boostEcl) {
-		if (dataUsedBits <= getNumDataCodewords(version, Ecc::MEDIUM  ) * 8)  newEcl = &Ecc::MEDIUM  ;
-		if (dataUsedBits <= getNumDataCodewords(version, Ecc::QUARTILE) * 8)  newEcl = &Ecc::QUARTILE;
-		if (dataUsedBits <= getNumDataCodewords(version, Ecc::HIGH    ) * 8)  newEcl = &Ecc::HIGH    ;
-	}
-	
-	// Create the data bit string by concatenating all segments
-	int dataCapacityBits = getNumDataCodewords(version, *newEcl) * 8;
-	BitBuffer bb;
-	for (size_t i = 0; i < segs.size(); i++) {
-		const QrSegment &seg(segs.at(i));
-		bb.appendBits(seg.mode.modeBits, 4);
-		bb.appendBits(seg.numChars, seg.mode.numCharCountBits(version));
-		bb.appendData(seg);
-	}
-	
-	// Add terminator and pad up to a byte if applicable
-	bb.appendBits(0, std::min(4, dataCapacityBits - bb.getBitLength()));
-	bb.appendBits(0, (8 - bb.getBitLength() % 8) % 8);
-	
-	// Pad with alternate bytes until data capacity is reached
-	for (uint8_t padByte = 0xEC; bb.getBitLength() < dataCapacityBits; padByte ^= 0xEC ^ 0x11)
-		bb.appendBits(padByte, 8);
-	if (bb.getBitLength() % 8 != 0)
-		throw "Assertion error";
-	
-	// Create the QR Code symbol
-	return QrCode(version, *newEcl, bb.getBytes(), mask);
-}
-
-
-qrcodegen::QrCode::QrCode(int ver, const Ecc &ecl, const std::vector<uint8_t> &dataCodewords, int mask) :
-		// Initialize scalar fields
-		version(ver),
-		size(1 <= ver && ver <= 40 ? ver * 4 + 17 : -1),  // Avoid signed overflow undefined behavior
-		errorCorrectionLevel(ecl) {
-	
-	// Check arguments
-	if (ver < 1 || ver > 40 || mask < -1 || mask > 7)
-		throw "Value out of range";
-	
-	std::vector<bool> row(size);
-	for (int i = 0; i < size; i++) {
-		modules.push_back(row);
-		isFunction.push_back(row);
-	}
-	
-	// Draw function patterns, draw all codewords, do masking
-	drawFunctionPatterns();
-	const std::vector<uint8_t> allCodewords(appendErrorCorrection(dataCodewords));
-	drawCodewords(allCodewords);
-	this->mask = handleConstructorMasking(mask);
-}
-
-
-qrcodegen::QrCode::QrCode(const QrCode &qr, int mask) :
-		// Copy scalar fields
-		version(qr.version),
-		size(qr.size),
-		errorCorrectionLevel(qr.errorCorrectionLevel) {
-	
-	// Check arguments
-	if (mask < -1 || mask > 7)
-		throw "Mask value out of range";
-	
-	// Handle grid fields
-	modules = qr.modules;
-	isFunction = qr.isFunction;
-	
-	// Handle masking
-	applyMask(qr.mask);  // Undo old mask
-	this->mask = handleConstructorMasking(mask);
-}
-
-
-int qrcodegen::QrCode::getMask() const {
-	return mask;
-}
-
-
-int qrcodegen::QrCode::getModule(int x, int y) const {
-	if (0 <= x && x < size && 0 <= y && y < size)
-		return modules.at(y).at(x) ? 1 : 0;
-	else
-		return 0;  // Infinite white border
-}
-
-
-std::string qrcodegen::QrCode::toSvgString(int border) const {
-	if (border < 0)
-		throw "Border must be non-negative";
-	std::ostringstream sb;
-	sb << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-	sb << "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n";
-	sb << "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" viewBox=\"0 0 ";
-	sb << (size + border * 2) << " " << (size + border * 2) << "\">\n";
-	sb << "\t<rect width=\"100%\" height=\"100%\" fill=\"#FFFFFF\" stroke-width=\"0\"/>\n";
-	sb << "\t<path d=\"";
-	bool head = true;
-	for (int y = -border; y < size + border; y++) {
-		for (int x = -border; x < size + border; x++) {
-			if (getModule(x, y) == 1) {
-				if (head)
-					head = false;
-				else
-					sb << " ";
-				sb << "M" << (x + border) << "," << (y + border) << "h1v1h-1z";
-			}
-		}
-	}
-	sb << "\" fill=\"#000000\" stroke-width=\"0\"/>\n";
-	sb << "</svg>\n";
-	return sb.str();
-}
-
-
-void qrcodegen::QrCode::drawFunctionPatterns() {
-	// Draw the horizontal and vertical timing patterns
-	for (int i = 0; i < size; i++) {
-		setFunctionModule(6, i, i % 2 == 0);
-		setFunctionModule(i, 6, i % 2 == 0);
-	}
-	
-	// Draw 3 finder patterns (all corners except bottom right; overwrites some timing modules)
-	drawFinderPattern(3, 3);
-	drawFinderPattern(size - 4, 3);
-	drawFinderPattern(3, size - 4);
-	
-	// Draw the numerous alignment patterns
-	const std::vector<int> alignPatPos(getAlignmentPatternPositions(version));
-	int numAlign = alignPatPos.size();
-	for (int i = 0; i < numAlign; i++) {
-		for (int j = 0; j < numAlign; j++) {
-			if ((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j == 0))
-				continue;  // Skip the three finder corners
-			else
-				drawAlignmentPattern(alignPatPos.at(i), alignPatPos.at(j));
-		}
-	}
-	
-	// Draw configuration data
-	drawFormatBits(0);  // Dummy mask value; overwritten later in the constructor
-	drawVersion();
-}
-
-
-void qrcodegen::QrCode::drawFormatBits(int mask) {
-	// Calculate error correction code and pack bits
-	int data = errorCorrectionLevel.formatBits << 3 | mask;  // errCorrLvl is uint2, mask is uint3
-	int rem = data;
-	for (int i = 0; i < 10; i++)
-		rem = (rem << 1) ^ ((rem >> 9) * 0x537);
-	data = data << 10 | rem;
-	data ^= 0x5412;  // uint15
-	if (data >> 15 != 0)
-		throw "Assertion error";
-	
-	// Draw first copy
-	for (int i = 0; i <= 5; i++)
-		setFunctionModule(8, i, ((data >> i) & 1) != 0);
-	setFunctionModule(8, 7, ((data >> 6) & 1) != 0);
-	setFunctionModule(8, 8, ((data >> 7) & 1) != 0);
-	setFunctionModule(7, 8, ((data >> 8) & 1) != 0);
-	for (int i = 9; i < 15; i++)
-		setFunctionModule(14 - i, 8, ((data >> i) & 1) != 0);
-	
-	// Draw second copy
-	for (int i = 0; i <= 7; i++)
-		setFunctionModule(size - 1 - i, 8, ((data >> i) & 1) != 0);
-	for (int i = 8; i < 15; i++)
-		setFunctionModule(8, size - 15 + i, ((data >> i) & 1) != 0);
-	setFunctionModule(8, size - 8, true);
-}
-
-
-void qrcodegen::QrCode::drawVersion() {
-	if (version < 7)
-		return;
-	
-	// Calculate error correction code and pack bits
-	int rem = version;  // version is uint6, in the range [7, 40]
-	for (int i = 0; i < 12; i++)
-		rem = (rem << 1) ^ ((rem >> 11) * 0x1F25);
-	int data = version << 12 | rem;  // uint18
-	if (data >> 18 != 0)
-		throw "Assertion error";
-	
-	// Draw two copies
-	for (int i = 0; i < 18; i++) {
-		bool bit = ((data >> i) & 1) != 0;
-		int a = size - 11 + i % 3, b = i / 3;
-		setFunctionModule(a, b, bit);
-		setFunctionModule(b, a, bit);
-	}
-}
-
-
-void qrcodegen::QrCode::drawFinderPattern(int x, int y) {
-	for (int i = -4; i <= 4; i++) {
-		for (int j = -4; j <= 4; j++) {
-			int dist = std::max(std::abs(i), std::abs(j));  // Chebyshev/infinity norm
-			int xx = x + j, yy = y + i;
-			if (0 <= xx && xx < size && 0 <= yy && yy < size)
-				setFunctionModule(xx, yy, dist != 2 && dist != 4);
-		}
-	}
-}
-
-
-void qrcodegen::QrCode::drawAlignmentPattern(int x, int y) {
-	for (int i = -2; i <= 2; i++) {
-		for (int j = -2; j <= 2; j++)
-			setFunctionModule(x + j, y + i, std::max(std::abs(i), std::abs(j)) != 1);
-	}
-}
-
-
-void qrcodegen::QrCode::setFunctionModule(int x, int y, bool isBlack) {
-	modules.at(y).at(x) = isBlack;
-	isFunction.at(y).at(x) = true;
-}
-
-
-std::vector<uint8_t> qrcodegen::QrCode::appendErrorCorrection(const std::vector<uint8_t> &data) const {
-	if (data.size() != static_cast<unsigned int>(getNumDataCodewords(version, errorCorrectionLevel)))
-		throw "Invalid argument";
-	
-	// Calculate parameter numbers
-	int numBlocks = NUM_ERROR_CORRECTION_BLOCKS[errorCorrectionLevel.ordinal][version];
-	int totalEcc = NUM_ERROR_CORRECTION_CODEWORDS[errorCorrectionLevel.ordinal][version];
-	if (totalEcc % numBlocks != 0)
-		throw "Assertion error";
-	int blockEccLen = totalEcc / numBlocks;
-	int numShortBlocks = numBlocks - getNumRawDataModules(version) / 8 % numBlocks;
-	int shortBlockLen = getNumRawDataModules(version) / 8 / numBlocks;
-	
-	// Split data into blocks and append ECC to each block
-	std::vector<std::vector<uint8_t>> blocks;
-	const ReedSolomonGenerator rs(blockEccLen);
-	for (int i = 0, k = 0; i < numBlocks; i++) {
-		std::vector<uint8_t> dat;
-		dat.insert(dat.begin(), data.begin() + k, data.begin() + (k + shortBlockLen - blockEccLen + (i < numShortBlocks ? 0 : 1)));
-		k += dat.size();
-		const std::vector<uint8_t> ecc(rs.getRemainder(dat));
-		if (i < numShortBlocks)
-			dat.push_back(0);
-		dat.insert(dat.end(), ecc.begin(), ecc.end());
-		blocks.push_back(dat);
-	}
-	
-	// Interleave (not concatenate) the bytes from every block into a single sequence
-	std::vector<uint8_t> result;
-	for (int i = 0; static_cast<unsigned int>(i) < blocks.at(0).size(); i++) {
-		for (int j = 0; static_cast<unsigned int>(j) < blocks.size(); j++) {
-			// Skip the padding byte in short blocks
-			if (i != shortBlockLen - blockEccLen || j >= numShortBlocks)
-				result.push_back(blocks.at(j).at(i));
-		}
-	}
-	if (result.size() != static_cast<unsigned int>(getNumRawDataModules(version) / 8))
-		throw "Assertion error";
-	return result;
-}
-
-
-void qrcodegen::QrCode::drawCodewords(const std::vector<uint8_t> &data) {
-	if (data.size() != static_cast<unsigned int>(getNumRawDataModules(version) / 8))
-		throw "Invalid argument";
-	
-	size_t i = 0;  // Bit index into the data
-	// Do the funny zigzag scan
-	for (int right = size - 1; right >= 1; right -= 2) {  // Index of right column in each column pair
-		if (right == 6)
-			right = 5;
-		for (int vert = 0; vert < size; vert++) {  // Vertical counter
-			for (int j = 0; j < 2; j++) {
-				int x = right - j;  // Actual x coordinate
-				bool upwards = ((right & 2) == 0) ^ (x < 6);
-				int y = upwards ? size - 1 - vert : vert;  // Actual y coordinate
-				if (!isFunction.at(y).at(x) && i < data.size() * 8) {
-					modules.at(y).at(x) = ((data.at(i >> 3) >> (7 - (i & 7))) & 1) != 0;
-					i++;
-				}
-				// If there are any remainder bits (0 to 7), they are already
-				// set to 0/false/white when the grid of modules was initialized
-			}
-		}
-	}
-	if (static_cast<unsigned int>(i) != data.size() * 8)
-		throw "Assertion error";
-}
-
-
-void qrcodegen::QrCode::applyMask(int mask) {
-	if (mask < 0 || mask > 7)
-		throw "Mask value out of range";
-	for (int y = 0; y < size; y++) {
-		for (int x = 0; x < size; x++) {
-			bool invert;
-			switch (mask) {
-				case 0:  invert = (x + y) % 2 == 0;                    break;
-				case 1:  invert = y % 2 == 0;                          break;
-				case 2:  invert = x % 3 == 0;                          break;
-				case 3:  invert = (x + y) % 3 == 0;                    break;
-				case 4:  invert = (x / 3 + y / 2) % 2 == 0;            break;
-				case 5:  invert = x * y % 2 + x * y % 3 == 0;          break;
-				case 6:  invert = (x * y % 2 + x * y % 3) % 2 == 0;    break;
-				case 7:  invert = ((x + y) % 2 + x * y % 3) % 2 == 0;  break;
-				default:  throw "Assertion error";
-			}
-			modules.at(y).at(x) = modules.at(y).at(x) ^ (invert & !isFunction.at(y).at(x));
-		}
-	}
-}
-
-
-int qrcodegen::QrCode::handleConstructorMasking(int mask) {
-	if (mask == -1) {  // Automatically choose best mask
-		int32_t minPenalty = INT32_MAX;
-		for (int i = 0; i < 8; i++) {
-			drawFormatBits(i);
-			applyMask(i);
-			int penalty = getPenaltyScore();
-			if (penalty < minPenalty) {
-				mask = i;
-				minPenalty = penalty;
-			}
-			applyMask(i);  // Undoes the mask due to XOR
-		}
-	}
-	if (mask < 0 || mask > 7)
-		throw "Assertion error";
-	drawFormatBits(mask);  // Overwrite old format bits
-	applyMask(mask);  // Apply the final choice of mask
-	return mask;  // The caller shall assign this value to the final-declared field
-}
-
-
-int qrcodegen::QrCode::getPenaltyScore() const {
-	int result = 0;
-	
-	// Adjacent modules in row having same color
-	for (int y = 0; y < size; y++) {
-		bool colorX = modules.at(y).at(0);
-		for (int x = 1, runX = 1; x < size; x++) {
-			if (modules.at(y).at(x) != colorX) {
-				colorX = modules.at(y).at(x);
-				runX = 1;
-			} else {
-				runX++;
-				if (runX == 5)
-					result += PENALTY_N1;
-				else if (runX > 5)
-					result++;
-			}
-		}
-	}
-	// Adjacent modules in column having same color
-	for (int x = 0; x < size; x++) {
-		bool colorY = modules.at(0).at(x);
-		for (int y = 1, runY = 1; y < size; y++) {
-			if (modules.at(y).at(x) != colorY) {
-				colorY = modules.at(y).at(x);
-				runY = 1;
-			} else {
-				runY++;
-				if (runY == 5)
-					result += PENALTY_N1;
-				else if (runY > 5)
-					result++;
-			}
-		}
-	}
-	
-	// 2*2 blocks of modules having same color
-	for (int y = 0; y < size - 1; y++) {
-		for (int x = 0; x < size - 1; x++) {
-			bool  color = modules.at(y).at(x);
-			if (  color == modules.at(y).at(x + 1) &&
-			      color == modules.at(y + 1).at(x) &&
-			      color == modules.at(y + 1).at(x + 1))
-				result += PENALTY_N2;
-		}
-	}
-	
-	// Finder-like pattern in rows
-	for (int y = 0; y < size; y++) {
-		for (int x = 0, bits = 0; x < size; x++) {
-			bits = ((bits << 1) & 0x7FF) | (modules.at(y).at(x) ? 1 : 0);
-			if (x >= 10 && (bits == 0x05D || bits == 0x5D0))  // Needs 11 bits accumulated
-				result += PENALTY_N3;
-		}
-	}
-	// Finder-like pattern in columns
-	for (int x = 0; x < size; x++) {
-		for (int y = 0, bits = 0; y < size; y++) {
-			bits = ((bits << 1) & 0x7FF) | (modules.at(y).at(x) ? 1 : 0);
-			if (y >= 10 && (bits == 0x05D || bits == 0x5D0))  // Needs 11 bits accumulated
-				result += PENALTY_N3;
-		}
-	}
-	
-	// Balance of black and white modules
-	int black = 0;
-	for (int y = 0; y < size; y++) {
-		for (int x = 0; x < size; x++) {
-			if (modules.at(y).at(x))
-				black++;
-		}
-	}
-	int total = size * size;
-	// Find smallest k such that (45-5k)% <= dark/total <= (55+5k)%
-	for (int k = 0; black*20 < (9-k)*total || black*20 > (11+k)*total; k++)
-		result += PENALTY_N4;
-	return result;
-}
-
-
-std::vector<int> qrcodegen::QrCode::getAlignmentPatternPositions(int ver) {
-	if (ver < 1 || ver > 40)
-		throw "Version number out of range";
-	else if (ver == 1)
-		return std::vector<int>();
-	else {
-		int numAlign = ver / 7 + 2;
-		int step;
-		if (ver != 32)
-			step = (ver * 4 + numAlign * 2 + 1) / (2 * numAlign - 2) * 2;  // ceil((size - 13) / (2*numAlign - 2)) * 2
-		else  // C-C-C-Combo breaker!
-			step = 26;
-		
-		std::vector<int> result;
-		int size = ver * 4 + 17;
-		for (int i = 0, pos = size - 7; i < numAlign - 1; i++, pos -= step)
-			result.insert(result.begin(), pos);
-		result.insert(result.begin(), 6);
-		return result;
-	}
-}
-
-
-int qrcodegen::QrCode::getNumRawDataModules(int ver) {
-	if (ver < 1 || ver > 40)
-		throw "Version number out of range";
-	int result = (16 * ver + 128) * ver + 64;
-	if (ver >= 2) {
-		int numAlign = ver / 7 + 2;
-		result -= (25 * numAlign - 10) * numAlign - 55;
-		if (ver >= 7)
-			result -= 18 * 2;  // Subtract version information
-	}
-	return result;
-}
-
-
-int qrcodegen::QrCode::getNumDataCodewords(int ver, const Ecc &ecl) {
-	if (ver < 1 || ver > 40)
-		throw "Version number out of range";
-	return getNumRawDataModules(ver) / 8 - NUM_ERROR_CORRECTION_CODEWORDS[ecl.ordinal][ver];
-}
-
-
-/*---- Tables of constants ----*/
-
-const int qrcodegen::QrCode::PENALTY_N1 = 3;
-const int qrcodegen::QrCode::PENALTY_N2 = 3;
-const int qrcodegen::QrCode::PENALTY_N3 = 40;
-const int qrcodegen::QrCode::PENALTY_N4 = 10;
-
-
-const int16_t qrcodegen::QrCode::NUM_ERROR_CORRECTION_CODEWORDS[4][41] = {
-	// Version: (note that index 0 is for padding, and is set to an illegal value)
-	//0,  1,  2,  3,  4,  5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,   25,   26,   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,   37,   38,   39,   40    Error correction level
-	{-1,  7, 10, 15, 20, 26,  36,  40,  48,  60,  72,  80,  96, 104, 120, 132, 144, 168, 180, 196, 224, 224, 252, 270, 300,  312,  336,  360,  390,  420,  450,  480,  510,  540,  570,  570,  600,  630,  660,  720,  750},  // Low
-	{-1, 10, 16, 26, 36, 48,  64,  72,  88, 110, 130, 150, 176, 198, 216, 240, 280, 308, 338, 364, 416, 442, 476, 504, 560,  588,  644,  700,  728,  784,  812,  868,  924,  980, 1036, 1064, 1120, 1204, 1260, 1316, 1372},  // Medium
-	{-1, 13, 22, 36, 52, 72,  96, 108, 132, 160, 192, 224, 260, 288, 320, 360, 408, 448, 504, 546, 600, 644, 690, 750, 810,  870,  952, 1020, 1050, 1140, 1200, 1290, 1350, 1440, 1530, 1590, 1680, 1770, 1860, 1950, 2040},  // Quartile
-	{-1, 17, 28, 44, 64, 88, 112, 130, 156, 192, 224, 264, 308, 352, 384, 432, 480, 532, 588, 650, 700, 750, 816, 900, 960, 1050, 1110, 1200, 1260, 1350, 1440, 1530, 1620, 1710, 1800, 1890, 1980, 2100, 2220, 2310, 2430},  // High
-};
-
-const int8_t qrcodegen::QrCode::NUM_ERROR_CORRECTION_BLOCKS[4][41] = {
-	// Version: (note that index 0 is for padding, and is set to an illegal value)
-	//0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40    Error correction level
-	{-1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4,  4,  4,  4,  4,  6,  6,  6,  6,  7,  8,  8,  9,  9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25},  // Low
-	{-1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5,  5,  8,  9,  9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49},  // Medium
-	{-1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8,  8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68},  // Quartile
-	{-1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81},  // High
-};
-
-
-qrcodegen::QrCode::ReedSolomonGenerator::ReedSolomonGenerator(int degree) :
-		coefficients() {
-	if (degree < 1 || degree > 255)
-		throw "Degree out of range";
-	
-	// Start with the monomial x^0
-	coefficients.resize(degree);
-	coefficients.at(degree - 1) = 1;
-	
-	// Compute the product polynomial (x - r^0) * (x - r^1) * (x - r^2) * ... * (x - r^{degree-1}),
-	// drop the highest term, and store the rest of the coefficients in order of descending powers.
-	// Note that r = 0x02, which is a generator element of this field GF(2^8/0x11D).
-	int root = 1;
-	for (int i = 0; i < degree; i++) {
-		// Multiply the current product by (x - r^i)
-		for (size_t j = 0; j < coefficients.size(); j++) {
-			coefficients.at(j) = multiply(coefficients.at(j), static_cast<uint8_t>(root));
-			if (j + 1 < coefficients.size())
-				coefficients.at(j) ^= coefficients.at(j + 1);
-		}
-		root = (root << 1) ^ ((root >> 7) * 0x11D);  // Multiply by 0x02 mod GF(2^8/0x11D)
-	}
-}
-
-
-std::vector<uint8_t> qrcodegen::QrCode::ReedSolomonGenerator::getRemainder(const std::vector<uint8_t> &data) const {
-	// Compute the remainder by performing polynomial division
-	std::vector<uint8_t> result(coefficients.size());
-	for (size_t i = 0; i < data.size(); i++) {
-		uint8_t factor = data.at(i) ^ result.at(0);
-		result.erase(result.begin());
-		result.push_back(0);
-		for (size_t j = 0; j < result.size(); j++)
-			result.at(j) ^= multiply(coefficients.at(j), factor);
-	}
-	return result;
-}
-
-
-uint8_t qrcodegen::QrCode::ReedSolomonGenerator::multiply(uint8_t x, uint8_t y) {
-	// Russian peasant multiplication
-	int z = 0;
-	for (int i = 7; i >= 0; i--) {
-		z = (z << 1) ^ ((z >> 7) * 0x11D);
-		z ^= ((y >> i) & 1) * x;
-	}
-	if (z >> 8 != 0)
-		throw "Assertion error";
-	return static_cast<uint8_t>(z);
-}

src/QR-Code-generator/QrCode.hpp

@@ -1,342 +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.
-
-/*
- * QR Code generator library (C++)
- * 
- * Copyright (c) 2016 Project Nayuki
- * https://www.nayuki.io/page/qr-code-generator-library
- * 
- * (MIT License)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * - The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- * - The Software is provided "as is", without warranty of any kind, express or
- *   implied, including but not limited to the warranties of merchantability,
- *   fitness for a particular purpose and noninfringement. In no event shall the
- *   authors or copyright holders be liable for any claim, damages or other
- *   liability, whether in an action of contract, tort or otherwise, arising from,
- *   out of or in connection with the Software or the use or other dealings in the
- *   Software.
- */
-
-#pragma once
-
-#include <cstdint>
-#include <string>
-#include <vector>
-#include "QrSegment.hpp"
-
-
-namespace qrcodegen {
-
-/* 
- * Represents an immutable square grid of black and white cells for a QR Code symbol, and
- * provides static functions to create a QR Code from user-supplied textual or binary data.
- * This class covers the QR Code model 2 specification, supporting all versions (sizes)
- * from 1 to 40, all 4 error correction levels, and only 3 character encoding modes.
- */
-class QrCode final {
-	
-	/*---- Public helper enumeration ----*/
-public:
-	
-	/* 
-	 * Represents the error correction level used in a QR Code symbol.
-	 */
-	class Ecc final {
-		// Constants declared in ascending order of error protection.
-	public:
-		const static Ecc LOW, MEDIUM, QUARTILE, HIGH;
-		
-		// Fields.
-	public:
-		const int ordinal;  // (Public) In the range 0 to 3 (unsigned 2-bit integer).
-		const int formatBits;  // (Package-private) In the range 0 to 3 (unsigned 2-bit integer).
-		
-		// Constructor.
-	private:
-		Ecc(int ord, int fb);
-	};
-	
-	
-	
-	/*---- Public static factory functions ----*/
-public:
-	
-	/* 
-	 * Returns a QR Code symbol representing the given Unicode text string at the given error correction level.
-	 * As a conservative upper bound, this function is guaranteed to succeed for strings that have 738 or fewer Unicode
-	 * code points (not UTF-16 code units). The smallest possible QR Code version is automatically chosen for the output.
-	 * The ECC level of the result may be higher than the ecl argument if it can be done without increasing the version.
-	 */
-	static QrCode encodeText(const char *text, const Ecc &ecl);
-	
-	
-	/* 
-	 * Returns a QR Code symbol representing the given binary data string at the given error correction level.
-	 * This function always encodes using the binary segment mode, not any text mode. The maximum number of
-	 * bytes allowed is 2953. The smallest possible QR Code version is automatically chosen for the output.
-	 * The ECC level of the result may be higher than the ecl argument if it can be done without increasing the version.
-	 */
-	static QrCode encodeBinary(const std::vector<uint8_t> &data, const Ecc &ecl);
-	
-	
-	/* 
-	 * Returns a QR Code symbol representing the specified data segments with the specified encoding parameters.
-	 * The smallest possible QR Code version within the specified range is automatically chosen for the output.
-	 * This function allows the user to create a custom sequence of segments that switches
-	 * between modes (such as alphanumeric and binary) to encode text more efficiently.
-	 * This function is considered to be lower level than simply encoding text or binary data.
-	 */
-	static QrCode encodeSegments(const std::vector<QrSegment> &segs, const Ecc &ecl,
-		int minVersion=1, int maxVersion=40, int mask=-1, bool boostEcl=true);  // All optional parameters
-	
-	
-	
-	/*---- Instance fields ----*/
-	
-	// Public immutable scalar parameters
-public:
-	
-	/* This QR Code symbol's version number, which is always between 1 and 40 (inclusive). */
-	const int version;
-	
-	/* The width and height of this QR Code symbol, measured in modules.
-	 * Always equal to version &times; 4 + 17, in the range 21 to 177. */
-	const int size;
-	
-	/* The error correction level used in this QR Code symbol. */
-	const Ecc &errorCorrectionLevel;
-	
-	/* The mask pattern used in this QR Code symbol, in the range 0 to 7 (i.e. unsigned 3-bit integer).
-	 * Note that even if a constructor was called with automatic masking requested
-	 * (mask = -1), the resulting object will still have a mask value between 0 and 7. */
-private:
-	int mask;
-	
-	// Private grids of modules/pixels (conceptually immutable)
-private:
-	std::vector<std::vector<bool>> modules;     // The modules of this QR Code symbol (false = white, true = black)
-	std::vector<std::vector<bool>> isFunction;  // Indicates function modules that are not subjected to masking
-	
-	
-	
-	/*---- Constructors ----*/
-public:
-	
-	/* 
-	 * Creates a new QR Code symbol with the given version number, error correction level, binary data array,
-	 * and mask number. This is a cumbersome low-level constructor that should not be invoked directly by the user.
-	 * To go one level up, see the encodeSegments() function.
-	 */
-	QrCode(int ver, const Ecc &ecl, const std::vector<uint8_t> &dataCodewords, int mask);
-	
-	
-	/* 
-	 * Creates a new QR Code symbol based on the given existing object, but with a potentially
-	 * different mask pattern. The version, error correction level, codewords, etc. of the newly
-	 * created object are all identical to the argument object; only the mask may differ.
-	 */
-	QrCode(const QrCode &qr, int mask);
-	
-	
-	
-	/*---- Public instance methods ----*/
-public:
-	
-	int getMask() const;
-	
-	
-	/* 
-	 * Returns the color of the module (pixel) at the given coordinates, which is either 0 for white or 1 for black. The top
-	 * left corner has the coordinates (x=0, y=0). If the given coordinates are out of bounds, then 0 (white) is returned.
-	 */
-	int getModule(int x, int y) const;
-	
-	
-	/* 
-	 * Based on the given number of border modules to add as padding, this returns a
-	 * string whose contents represents an SVG XML file that depicts this QR Code symbol.
-	 * Note that Unix newlines (\n) are always used, regardless of the platform.
-	 */
-	std::string toSvgString(int border) const;
-	
-	
-	
-	/*---- Private helper methods for constructor: Drawing function modules ----*/
-private:
-	
-	void drawFunctionPatterns();
-	
-	
-	// Draws two copies of the format bits (with its own error correction code)
-	// based on the given mask and this object's error correction level field.
-	void drawFormatBits(int mask);
-	
-	
-	// Draws two copies of the version bits (with its own error correction code),
-	// based on this object's version field (which only has an effect for 7 <= version <= 40).
-	void drawVersion();
-	
-	
-	// Draws a 9*9 finder pattern including the border separator, with the center module at (x, y).
-	void drawFinderPattern(int x, int y);
-	
-	
-	// Draws a 5*5 alignment pattern, with the center module at (x, y).
-	void drawAlignmentPattern(int x, int y);
-	
-	
-	// Sets the color of a module and marks it as a function module.
-	// Only used by the constructor. Coordinates must be in range.
-	void setFunctionModule(int x, int y, bool isBlack);
-	
-	
-	/*---- Private helper methods for constructor: Codewords and masking ----*/
-private:
-	
-	// Returns a new byte string representing the given data with the appropriate error correction
-	// codewords appended to it, based on this object's version and error correction level.
-	std::vector<uint8_t> appendErrorCorrection(const std::vector<uint8_t> &data) const;
-	
-	
-	// Draws the given sequence of 8-bit codewords (data and error correction) onto the entire
-	// data area of this QR Code symbol. Function modules need to be marked off before this is called.
-	void drawCodewords(const std::vector<uint8_t> &data);
-	
-	
-	// XORs the data modules in this QR Code with the given mask pattern. Due to XOR's mathematical
-	// properties, calling applyMask(m) twice with the same value is equivalent to no change at all.
-	// This means it is possible to apply a mask, undo it, and try another mask. Note that a final
-	// well-formed QR Code symbol needs exactly one mask applied (not zero, not two, etc.).
-	void applyMask(int mask);
-	
-	
-	// A messy helper function for the constructors. This QR Code must be in an unmasked state when this
-	// method is called. The given argument is the requested mask, which is -1 for auto or 0 to 7 for fixed.
-	// This method applies and returns the actual mask chosen, from 0 to 7.
-	int handleConstructorMasking(int mask);
-	
-	
-	// Calculates and returns the penalty score based on state of this QR Code's current modules.
-	// This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score.
-	int getPenaltyScore() const;
-	
-	
-	
-	/*---- Private static helper functions ----*/
-private:
-	
-	// Returns a set of positions of the alignment patterns in ascending order. These positions are
-	// used on both the x and y axes. Each value in the resulting array is in the range [0, 177).
-	// This stateless pure function could be implemented as table of 40 variable-length lists of unsigned bytes.
-	static std::vector<int> getAlignmentPatternPositions(int ver);
-	
-	
-	// Returns the number of raw data modules (bits) available at the given version number.
-	// These data modules are used for both user data codewords and error correction codewords.
-	// This stateless pure function could be implemented as a 40-entry lookup table.
-	static int getNumRawDataModules(int ver);
-	
-	
-	// Returns the number of 8-bit data (i.e. not error correction) codewords contained in any
-	// QR Code of the given version number and error correction level, with remainder bits discarded.
-	// This stateless pure function could be implemented as a (40*4)-cell lookup table.
-	static int getNumDataCodewords(int ver, const Ecc &ecl);
-	
-	
-	/*---- Private tables of constants ----*/
-private:
-	
-	// For use in getPenaltyScore(), when evaluating which mask is best.
-	static const int PENALTY_N1;
-	static const int PENALTY_N2;
-	static const int PENALTY_N3;
-	static const int PENALTY_N4;
-	
-	static const int16_t NUM_ERROR_CORRECTION_CODEWORDS[4][41];
-	static const int8_t NUM_ERROR_CORRECTION_BLOCKS[4][41];
-	
-	
-	
-	/*---- Private helper class ----*/
-private:
-	
-	/* 
-	 * Computes the Reed-Solomon error correction codewords for a sequence of data codewords
-	 * at a given degree. Objects are immutable, and the state only depends on the degree.
-	 * This class exists because the divisor polynomial does not need to be recalculated for every input.
-	 */
-	class ReedSolomonGenerator final {
-		
-		/*-- Immutable field --*/
-	private:
-		
-		// Coefficients of the divisor polynomial, stored from highest to lowest power, excluding the leading term which
-		// is always 1. For example the polynomial x^3 + 255x^2 + 8x + 93 is stored as the uint8 array {255, 8, 93}.
-		std::vector<uint8_t> coefficients;
-		
-		
-		/*-- Constructor --*/
-	public:
-		
-		/* 
-		 * Creates a Reed-Solomon ECC generator for the given degree. This could be implemented
-		 * as a lookup table over all possible parameter values, instead of as an algorithm.
-		 */
-		ReedSolomonGenerator(int degree);
-		
-		
-		/*-- Method --*/
-	public:
-		
-		/* 
-		 * Computes and returns the Reed-Solomon error correction codewords for the given sequence of data codewords.
-		 * The returned object is always a new byte array. This method does not alter this object's state (because it is immutable).
-		 */
-		std::vector<uint8_t> getRemainder(const std::vector<uint8_t> &data) const;
-		
-		
-		/*-- Static function --*/
-	private:
-		
-		// Returns the product of the two given field elements modulo GF(2^8/0x11D). The arguments and result
-		// are unsigned 8-bit integers. This could be implemented as a lookup table of 256*256 entries of uint8.
-		static uint8_t multiply(uint8_t x, uint8_t y);
-		
-	};
-	
-};
-
-}

src/QR-Code-generator/QrSegment.cpp

@@ -1,201 +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.
-
-/*
- * QR Code generator library (C++)
- * 
- * Copyright (c) 2016 Project Nayuki
- * https://www.nayuki.io/page/qr-code-generator-library
- * 
- * (MIT License)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * - The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- * - The Software is provided "as is", without warranty of any kind, express or
- *   implied, including but not limited to the warranties of merchantability,
- *   fitness for a particular purpose and noninfringement. In no event shall the
- *   authors or copyright holders be liable for any claim, damages or other
- *   liability, whether in an action of contract, tort or otherwise, arising from,
- *   out of or in connection with the Software or the use or other dealings in the
- *   Software.
- */
-
-#include <cstddef>
-#include "BitBuffer.hpp"
-#include "QrSegment.hpp"
-
-
-qrcodegen::QrSegment::Mode::Mode(int mode, int cc0, int cc1, int cc2) :
-		modeBits(mode) {
-	numBitsCharCount[0] = cc0;
-	numBitsCharCount[1] = cc1;
-	numBitsCharCount[2] = cc2;
-}
-
-
-int qrcodegen::QrSegment::Mode::numCharCountBits(int ver) const {
-	if      ( 1 <= ver && ver <=  9)  return numBitsCharCount[0];
-	else if (10 <= ver && ver <= 26)  return numBitsCharCount[1];
-	else if (27 <= ver && ver <= 40)  return numBitsCharCount[2];
-	else  throw "Version number out of range";
-}
-
-
-const qrcodegen::QrSegment::Mode qrcodegen::QrSegment::Mode::NUMERIC     (0x1, 10, 12, 14);
-const qrcodegen::QrSegment::Mode qrcodegen::QrSegment::Mode::ALPHANUMERIC(0x2,  9, 11, 13);
-const qrcodegen::QrSegment::Mode qrcodegen::QrSegment::Mode::BYTE        (0x4,  8, 16, 16);
-const qrcodegen::QrSegment::Mode qrcodegen::QrSegment::Mode::KANJI       (0x8,  8, 10, 12);
-
-
-
-qrcodegen::QrSegment qrcodegen::QrSegment::makeBytes(const std::vector<uint8_t> &data) {
-	return QrSegment(Mode::BYTE, data.size(), data, data.size() * 8);
-}
-
-
-qrcodegen::QrSegment qrcodegen::QrSegment::makeNumeric(const char *digits) {
-	BitBuffer bb;
-	int accumData = 0;
-	int accumCount = 0;
-	int charCount = 0;
-	for (; *digits != '\0'; digits++, charCount++) {
-		char c = *digits;
-		if (c < '0' || c > '9')
-			throw "String contains non-numeric characters";
-		accumData = accumData * 10 + (c - '0');
-		accumCount++;
-		if (accumCount == 3) {
-			bb.appendBits(accumData, 10);
-			accumData = 0;
-			accumCount = 0;
-		}
-	}
-	if (accumCount > 0)  // 1 or 2 digits remaining
-		bb.appendBits(accumData, accumCount * 3 + 1);
-	return QrSegment(Mode::NUMERIC, charCount, bb.getBytes(), bb.getBitLength());
-}
-
-
-qrcodegen::QrSegment qrcodegen::QrSegment::makeAlphanumeric(const char *text) {
-	BitBuffer bb;
-	int accumData = 0;
-	int accumCount = 0;
-	int charCount = 0;
-	for (; *text != '\0'; text++, charCount++) {
-		char c = *text;
-		if (c < ' ' || c > 'Z')
-			throw "String contains unencodable characters in alphanumeric mode";
-		accumData = accumData * 45 + ALPHANUMERIC_ENCODING_TABLE[c - ' '];
-		accumCount++;
-		if (accumCount == 2) {
-			bb.appendBits(accumData, 11);
-			accumData = 0;
-			accumCount = 0;
-		}
-	}
-	if (accumCount > 0)  // 1 character remaining
-		bb.appendBits(accumData, 6);
-	return QrSegment(Mode::ALPHANUMERIC, charCount, bb.getBytes(), bb.getBitLength());
-}
-
-
-std::vector<qrcodegen::QrSegment> qrcodegen::QrSegment::makeSegments(const char *text) {
-	// Select the most efficient segment encoding automatically
-	std::vector<QrSegment> result;
-	if (*text == '\0');  // Leave the vector empty
-	else if (QrSegment::isNumeric(text))
-		result.push_back(QrSegment::makeNumeric(text));
-	else if (QrSegment::isAlphanumeric(text))
-		result.push_back(QrSegment::makeAlphanumeric(text));
-	else {
-		std::vector<uint8_t> bytes;
-		for (; *text != '\0'; text++)
-			bytes.push_back(static_cast<uint8_t>(*text));
-		result.push_back(QrSegment::makeBytes(bytes));
-	}
-	return result;
-}
-
-
-qrcodegen::QrSegment::QrSegment(const Mode &md, int numCh, const std::vector<uint8_t> &b, int bitLen) :
-		mode(md),
-		numChars(numCh),
-		data(b),
-		bitLength(bitLen) {
-	if (numCh < 0 || bitLen < 0 || b.size() != static_cast<unsigned int>((bitLen + 7) / 8))
-		throw "Invalid value";
-}
-
-
-int qrcodegen::QrSegment::getTotalBits(const std::vector<QrSegment> &segs, int version) {
-	if (version < 1 || version > 40)
-		throw "Version number out of range";
-	int result = 0;
-	for (size_t i = 0; i < segs.size(); i++) {
-		const QrSegment &seg(segs.at(i));
-		int ccbits = seg.mode.numCharCountBits(version);
-		// Fail if segment length value doesn't fit in the length field's bit-width
-		if (seg.numChars >= (1 << ccbits))
-			return -1;
-		result += 4 + ccbits + seg.bitLength;
-	}
-	return result;
-}
-
-
-bool qrcodegen::QrSegment::isAlphanumeric(const char *text) {
-	for (; *text != '\0'; text++) {
-		char c = *text;
-		if (c < ' ' || c > 'Z' || ALPHANUMERIC_ENCODING_TABLE[c - ' '] == -1)
-			return false;
-	}
-	return true;
-}
-
-
-bool qrcodegen::QrSegment::isNumeric(const char *text) {
-	for (; *text != '\0'; text++) {
-		char c = *text;
-		if (c < '0' || c > '9')
-			return false;
-	}
-	return true;
-}
-
-
-const int8_t qrcodegen::QrSegment::ALPHANUMERIC_ENCODING_TABLE[59] = {
-	// SP,  !,  ",  #,  $,  %,  &,  ',  (,  ),  *,  +,  ,,  -,  .,  /,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  :,  ;,  <,  =,  >,  ?,  @,  // ASCII codes 32 to 64
-	   36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1, -1,  // Array indices 0 to 32
-	   10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,  // Array indices 33 to 58
-	//  A,  B,  C,  D,  E,  F,  G,  H,  I,  J,  K,  L,  M,  N,  O,  P,  Q,  R,  S,  T,  U,  V,  W,  X,  Y,  Z,  // ASCII codes 65 to 90
-};

src/QR-Code-generator/QrSegment.hpp

@@ -1,198 +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.
-
-/*
- * QR Code generator library (C++)
- * 
- * Copyright (c) 2016 Project Nayuki
- * https://www.nayuki.io/page/qr-code-generator-library
- * 
- * (MIT License)
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * - The above copyright notice and this permission notice shall be included in
- *   all copies or substantial portions of the Software.
- * - The Software is provided "as is", without warranty of any kind, express or
- *   implied, including but not limited to the warranties of merchantability,
- *   fitness for a particular purpose and noninfringement. In no event shall the
- *   authors or copyright holders be liable for any claim, damages or other
- *   liability, whether in an action of contract, tort or otherwise, arising from,
- *   out of or in connection with the Software or the use or other dealings in the
- *   Software.
- */
-
-#pragma once
-
-#include <cstdint>
-#include <vector>
-
-
-namespace qrcodegen {
-
-/* 
- * Represents a character string to be encoded in a QR Code symbol. Each segment has
- * a mode, and a sequence of characters that is already encoded as a sequence of bits.
- * Instances of this class are immutable.
- * This segment class imposes no length restrictions, but QR Codes have restrictions.
- * Even in the most favorable conditions, a QR Code can only hold 7089 characters of data.
- * Any segment longer than this is meaningless for the purpose of generating QR Codes.
- */
-class QrSegment final {
-	
-	/*---- Public helper enumeration ----*/
-	
-	/* 
-	 * The mode field of a segment. Immutable. Provides methods to retrieve closely related values.
-	 */
-public:
-	class Mode final {
-		
-		/*-- Constants --*/
-	public:
-		
-		static const Mode NUMERIC;
-		static const Mode ALPHANUMERIC;
-		static const Mode BYTE;
-		static const Mode KANJI;
-		
-		
-		/*-- Fields --*/
-		
-		/* (Package-private) An unsigned 4-bit integer value (range 0 to 15) representing the mode indicator bits for this mode object. */
-	public:
-		const int modeBits;
-		
-	private:
-		int numBitsCharCount[3];
-		
-		
-		/*-- Constructor --*/
-		
-	private:
-		Mode(int mode, int cc0, int cc1, int cc2);
-		
-		
-		/*-- Method --*/
-		
-		/* 
-		 * (Package-private) Returns the bit width of the segment character count field for this mode object at the given version number.
-		 */
-	public:
-		int numCharCountBits(int ver) const;
-		
-	};
-	
-	
-	
-	/*---- Public static factory functions ----*/
-public:
-	
-	/* 
-	 * Returns a segment representing the given binary data encoded in byte mode.
-	 */
-	static QrSegment makeBytes(const std::vector<uint8_t> &data);
-	
-	
-	/* 
-	 * Returns a segment representing the given string of decimal digits encoded in numeric mode.
-	 */
-	static QrSegment makeNumeric(const char *digits);
-	
-	
-	/* 
-	 * Returns a segment representing the given text string encoded in alphanumeric mode. The characters allowed are:
-	 * 0 to 9, A to Z (uppercase only), space, dollar, percent, asterisk, plus, hyphen, period, slash, colon.
-	 */
-	static QrSegment makeAlphanumeric(const char *text);
-	
-	
-	/* 
-	 * Returns a list of zero or more segments to represent the given text string.
-	 * The result may use various segment modes and switch modes to optimize the length of the bit stream.
-	 */
-	static std::vector<QrSegment> makeSegments(const char *text);
-	
-	
-	/*---- Public static helper functions ----*/
-public:
-	
-	/* 
-	 * Tests whether the given string can be encoded as a segment in alphanumeric mode.
-	 */
-	static bool isAlphanumeric(const char *text);
-	
-	
-	/* 
-	 * Tests whether the given string can be encoded as a segment in numeric mode.
-	 */
-	static bool isNumeric(const char *text);
-	
-	
-	
-	/*---- Instance fields ----*/
-public:
-	
-	/* The mode indicator for this segment. */
-	const Mode mode;
-	
-	/* The length of this segment's unencoded data, measured in characters. Always zero or positive. */
-	const int numChars;
-	
-	/* The bits of this segment packed into a byte array in big endian. */
-	const std::vector<uint8_t> data;
-	
-	/* The length of this segment's encoded data, measured in bits. Satisfies ceil(bitLength / 8) = data.size(). */
-	const int bitLength;
-	
-	
-	/*---- Constructor ----*/
-public:
-	
-	/* 
-	 * Creates a new QR Code data segment with the given parameters and data.
-	 */
-	QrSegment(const Mode &md, int numCh, const std::vector<uint8_t> &b, int bitLen);
-	
-	
-	// Package-private helper function.
-	static int getTotalBits(const std::vector<QrSegment> &segs, int version);
-	
-	
-	/*---- Private constant ----*/
-private:
-	
-	/* Maps shifted ASCII codes to alphanumeric mode character codes. */
-	static const int8_t ALPHANUMERIC_ENCODING_TABLE[59];
-	
-};
-
-}

src/QR-Code-generator/Readme.markdown

@@ -1,119 +0,0 @@
-QR Code generator library
-=========================
-
-
-Introduction
-------------
-
-This project aims to provide the best and clearest QR Code generator library. The primary goals are flexible options and absolute correctness. The secondary goals are compact implementation size and good documentation comments.
-
-Home page with live JavaScript demo and extensive description: [https://www.nayuki.io/page/qr-code-generator-library](https://www.nayuki.io/page/qr-code-generator-library)
-
-
-Features
---------
-
-Core features:
-
-* Available in 4 programming languages, all with nearly equal functionality: Java, JavaScript, Python, C++
-* Significantly shorter code but more documentation comments compared to competing libraries
-* Supports encoding all 40 versions (sizes) and all 4 error correction levels, as per the QR Code Model 2 standard
-* Output formats: Raw modules/pixels of the QR symbol (all languages), SVG XML string (all languages), BufferedImage raster bitmap (Java only)
-* Encodes numeric and special-alphanumeric text in less space than general text
-* Open source code under the permissive MIT License
-
-Manual parameters:
-
-* User can specify minimum and maximum version numbers allowed, then library will automatically choose smallest version in the range that fits the data
-* User can specify mask pattern manually, otherwise library will automatically evaluate all 8 masks and select the optimal one
-* User can specify absolute error correction level, or allow the library to boost it if it doesn't increase the version number
-
-Optional advanced features (Java only):
-
-* Encodes Japanese Unicode text in kanji mode to save a lot of space compared to UTF-8 bytes
-* Computes optimal segment mode switching for text with mixed numeric/alphanumeric/general parts
-
-
-Examples
---------
-
-Java language:
-
-    import io.nayuki.qrcodegen.*;
-    
-    // Simple operation
-    QrCode qr0 = QrCode.encodeText("Hello, world!", QrCode.Ecc.MEDIUM);
-    BufferedImage img = qr0.toImage(4, 10);
-    ImageIO.write(img, "png", new File("qr-code.png"));
-    
-    // Manual operation
-    List<QrSegment> segs = QrSegment.makeSegments("3141592653589793238462643383");
-    QrCode qr1 = QrCode.encodeSegments(segs, QrCode.Ecc.HIGH, 5, 5, 2, false);
-
-JavaScript language:
-
-    // Name abbreviated for the sake of these examples here
-    var QRC = qrcodegen.QrCode;
-    
-    // Simple operation
-    var qr0 = QRC.encodeText("Hello, world!", QRC.Ecc.MEDIUM);
-    var svg = qr0.toSvgString(4);
-    
-    // Manual operation
-    var segs = qrcodegen.QrSegment.makeSegments("3141592653589793238462643383");
-    var qr1 = QRC.encodeSegments(segs, QRC.Ecc.HIGH, 5, 5, 2, false);
-
-Python language:
-
-    from qrcodegen import *
-    
-    # Simple operation
-    qr0 = QrCode.encode_text("Hello, world!", QrCode.Ecc.MEDIUM)
-    svg = qr0.to_svg_str(4)
-    
-    # Manual operation
-    segs = QrSegment.make_segments("3141592653589793238462643383")
-    qr1 = QrCode.encode_segments(segs, QrCode.Ecc.HIGH, 5, 5, 2, False)
-
-C++ language:
-
-    #include <string>
-    #include <vector>
-    #include "QrCode.hpp"
-    using namespace qrcodegen;
-    
-    // Simple operation
-    QrCode qr0 = QrCode::encodeText("Hello, world!", QrCode::Ecc::MEDIUM);
-    std::string svg = qr0.toSvgString(4);
-    
-    // Manual operation
-    std::vector<QrSegment> segs =
-        QrSegment::makeSegments("3141592653589793238462643383");
-    QrCode qr1 = QrCode::encodeSegments(segs, QrCode::Ecc::HIGH, 5, 5, 2, false);
-
-
-License
--------
-
-Copyright © 2016 Project Nayuki  
-[https://www.nayuki.io/page/qr-code-generator-library](https://www.nayuki.io/page/qr-code-generator-library)
-
-(MIT License)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-* The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-* The Software is provided "as is", without warranty of any kind, express or
-  implied, including but not limited to the warranties of merchantability,
-  fitness for a particular purpose and noninfringement. In no event shall the
-  authors or copyright holders be liable for any claim, damages or other
-  liability, whether in an action of contract, tort or otherwise, arising from,
-  out of or in connection with the Software or the use or other dealings in the
-  Software.

src/QR-Code-scanner/CMakeLists.txt

@@ -1,4 +1,21 @@
-file(GLOB_RECURSE SRC_SOURCES *.cpp)
-file(GLOB_RECURSE SRC_HEADERS *.h)
-
+add_library(qrdecoder STATIC
+    Decoder.cpp
+)
+target_link_libraries(qrdecoder
+    PUBLIC
+        Qt5::Gui
+    PRIVATE
+        quirc
+)
 
+if(WITH_SCANNER)
+    add_library(qrscanner
+        QrCodeScanner.cpp
+        QrScanThread.cpp
+    )
+    target_link_libraries(qrscanner
+        PUBLIC
+            Qt5::Multimedia
+            qrdecoder
+    )
+endif()

src/QR-Code-scanner/Decoder.cpp

@@ -0,0 +1,99 @@
+// 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
+// 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.
+
+#include "Decoder.h"
+
+#include <limits>
+
+#include "quirc.h"
+
+QrDecoder::QrDecoder()
+    : m_qr(quirc_new())
+{
+    if (m_qr == nullptr)
+    {
+        throw std::runtime_error("QUIRC: failed to allocate memory");
+    }
+}
+
+QrDecoder::~QrDecoder()
+{
+    quirc_destroy(m_qr);
+}
+
+std::vector<std::string> QrDecoder::decode(const QImage &image)
+{
+    if (image.format() == QImage::Format_Grayscale8)
+    {
+        return decodeGrayscale8(image);
+    }
+    return decodeGrayscale8(image.convertToFormat(QImage::Format_Grayscale8));
+}
+
+std::vector<std::string> QrDecoder::decodeGrayscale8(const QImage &image)
+{
+    if (quirc_resize(m_qr, image.width(), image.height()) < 0)
+    {
+        throw std::runtime_error("QUIRC: failed to allocate video memory");
+    }
+
+    uint8_t *rawImage = quirc_begin(m_qr, nullptr, nullptr);
+    if (rawImage == nullptr)
+    {
+        throw std::runtime_error("QUIRC: failed to get image buffer");
+    }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+    std::copy(image.constBits(), image.constBits() + image.sizeInBytes(), rawImage);
+#else
+    std::copy(image.constBits(), image.constBits() + image.byteCount(), rawImage);
+#endif
+    quirc_end(m_qr);
+
+    const int count = quirc_count(m_qr);
+    if (count < 0)
+    {
+        throw std::runtime_error("QUIRC: failed to get the number of recognized QR-codes");
+    }
+
+    std::vector<std::string> result;
+    result.reserve(static_cast<size_t>(count));
+    for (int index = 0; index < count; ++index)
+    {
+        quirc_code code;
+        quirc_extract(m_qr, index, &code);
+
+        quirc_data data;
+        const quirc_decode_error_t err = quirc_decode(&code, &data);
+        if (err == QUIRC_SUCCESS)
+        {
+            result.emplace_back(&data.payload[0], &data.payload[data.payload_len]);
+        }
+    }
+
+    return result;
+}

src/QR-Code-scanner/Decoder.h

@@ -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,18 +26,24 @@
 // 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 <string>
-#include <iostream>
-#include <google/protobuf/message.h>
-#include <google/protobuf/unknown_field_set.h>
-#include "test-protobuf.pb.h"
+#include <QImage>
 
-int main(int argc, char *argv[]) {
-  google::protobuf::UnknownFieldSet ufs;
-  ufs.ClearAndFreeMemory();
+struct quirc;
 
-  Success sc;
-  sc.set_message("test");
-  sc.SerializeToOstream(&std::cerr);
-  return 0;
-}
+class QrDecoder
+{
+public:
+    QrDecoder(const QrDecoder &) = delete;
+    QrDecoder &operator=(const QrDecoder &) = delete;
+
+    QrDecoder();
+    ~QrDecoder();
+
+    std::vector<std::string> decode(const QImage &image);
+
+private:
+    std::vector<std::string> decodeGrayscale8(const QImage &image);
+
+private:
+    quirc *m_qr;
+};