Merge pull request #3223

1571662 build: prepare v0.17.1.4 (selsta)

.dockerignore

@@ -0,0 +1 @@
+*

.github/workflows/build.yml

@@ -0,0 +1,120 @@
+name: continuous-integration/gh-actions/gui
+
+on: [push, pull_request]
+
+jobs:
+  build-macos:
+    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 qt5 pkg-config
+    - name: build
+      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
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: recursive
+    - name: remove bundled boost
+      run: sudo rm -rf /usr/local/share/boost
+    - name: set apt conf
+      run: |
+        echo "Acquire::Retries \"3\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
+        echo "Acquire::http::Timeout \"120\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
+        echo "Acquire::ftp::Timeout \"120\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
+    - name: update apt
+      run: sudo apt update
+    - 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
+    - name: build
+      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
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: recursive
+    - 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: DEV_MODE=ON make release-win64 -j2
+    - name: test qml
+      run: build/release/bin/monero-wallet-gui --test-qml
+
+  docker-linux-static:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: recursive
+    - uses: satackey/action-docker-layer-caching@v0.0.8
+      continue-on-error: true
+      with:
+        key: docker-linux-static-{hash}
+        restore-keys: |
+          docker-linux-static-
+    - 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'
+    - 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.8
+      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'
+    - 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

.gitignore

@@ -11,3 +11,26 @@ moc_*
 *.xcodeproj
 monero-wallet-gui_plugin_import.cpp
 monero-wallet-gui_qml_plugin_import.cpp
+*.qmlc
+*.jsc
+qml_qmlcache.qrc
+
+### Vim ###
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary                                                                                                                                                                                             
+.netrwhist
+*~
+*.autosave
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~

CMakeLists.txt

@@ -0,0 +1,557 @@
+cmake_minimum_required(VERSION 3.5)
+project(monero-gui)
+
+message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
+
+set(VERSION_MAJOR "17")
+set(VERSION_MINOR "1")
+set(VERSION_REVISION "4")
+set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
+
+option(STATIC "Link libraries statically, requires static Qt")
+
+option(USE_DEVICE_TREZOR "Trezor support compilation" ON)
+option(ENABLE_PASS_STRENGTH_METER "Enable zxcvbn library for password strength" OFF)
+option(WITH_SCANNER "Enable webcam QR scanner" OFF)
+option(DEV_MODE "Checkout latest monero master on build" OFF)
+
+list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake")
+include(CheckCCompilerFlag)
+include(CheckCXXCompilerFlag)
+include(CheckLinkerFlag)
+include(FindCcache)
+
+if(DEBUG)
+	set(CMAKE_VERBOSE_MAKEFILE ON)
+endif()
+
+set(BUILD_GUI_DEPS ON)
+set(ARCH "x86-64" CACHE STRING "Target architecture")
+set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries")
+
+if(NOT MANUAL_SUBMODULES)
+  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 update --init --force --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_SUBMODULE_UPDATE_RESULT)
+      if(NOT GIT_FETCH_RESULT EQUAL "0" OR NOT GIT_CHECKOUT_MASTER_RESULT EQUAL "0" OR NOT GIT_SUBMODULE_UPDATE_RESULT EQUAL "0")
+        message(FATAL_ERROR "Updating git submodule to master (-DDEV_MODE=ON) failed")
+      endif()
+    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)
+endif()
+
+if(STATIC)
+  message(STATUS "Initiating static build")
+  set(Boost_USE_STATIC_LIBS ON)
+  set(Boost_USE_STATIC_RUNTIME ON)
+  set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+  add_definitions(-DMONERO_GUI_STATIC)
+endif()
+
+# Include password strength library
+if(ENABLE_PASS_STRENGTH_METER)
+    message(STATUS "Building with pass strength meter support.")
+else()
+    add_definitions(-DDISABLE_PASS_STRENGTH_METER)
+endif()
+
+include(CMakePackageConfigHelpers)
+
+# force version update
+function (monero_gui_add_library_with_deps)
+  cmake_parse_arguments(MONERO_ADD_LIBRARY "" "NAME" "DEPENDS;SOURCES" ${ARGN})
+  source_group("${MONERO_ADD_LIBRARY_NAME}" FILES ${MONERO_ADD_LIBRARY_SOURCES})
+
+  # Define a ("virtual") object library and an actual library that links those
+  # objects together. The virtual libraries can be arbitrarily combined to link
+  # any subset of objects into one library archive. This is used for releasing
+  # libwallet, which combines multiple components.
+  set(objlib obj_${MONERO_ADD_LIBRARY_NAME})
+  add_library(${objlib} OBJECT ${MONERO_ADD_LIBRARY_SOURCES})
+  add_library("${MONERO_ADD_LIBRARY_NAME}" $<TARGET_OBJECTS:${objlib}>)
+  if (MONERO_ADD_LIBRARY_DEPENDS)
+    add_dependencies(${objlib} ${MONERO_ADD_LIBRARY_DEPENDS})
+  endif()
+  set_property(TARGET "${MONERO_ADD_LIBRARY_NAME}" PROPERTY FOLDER "libs")
+  target_compile_definitions(${objlib}
+    PRIVATE $<TARGET_PROPERTY:${MONERO_ADD_LIBRARY_NAME},INTERFACE_COMPILE_DEFINITIONS>)
+endfunction ()
+
+function (monero_gui_add_library name)
+    monero_gui_add_library_with_deps(NAME "${name}" SOURCES ${ARGN})
+endfunction()
+
+include_directories(${EASYLOGGING_INCLUDE})
+link_directories(${EASYLOGGING_LIBRARY_DIRS})
+
+
+include(VersionGui)
+monero_gui_add_library(gui_version SOURCES version.js DEPENDS genversiongui)
+
+message(STATUS "${CMAKE_MODULE_PATH}")
+
+# OpenSSL
+if(APPLE AND NOT OPENSSL_ROOT_DIR)
+  execute_process(COMMAND brew --prefix openssl OUTPUT_VARIABLE OPENSSL_ROOT_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+find_package(OpenSSL REQUIRED)
+message(STATUS "OpenSSL: Version ${OPENSSL_VERSION}")
+message(STATUS "OpenSSL: include dir at ${OPENSSL_INCLUDE_DIR}")
+message(STATUS "OpenSSL: libraries at ${OPENSSL_LIBRARIES} ${OPENSSL_SSL_LIBRARIES}")
+
+# Zbar (for QR scanner)
+if(WITH_SCANNER)
+    add_definitions(-DWITH_SCANNER)
+    find_package(ZBar0 REQUIRED)
+    message(STATUS "libzbar: include dir at ${ZBAR_INCLUDE_DIR}")
+    message(STATUS "libzbar: libraries at ${ZBAR_LIBRARIES}")
+endif()
+
+# Sodium
+find_library(SODIUM_LIBRARY sodium)
+message(STATUS "libsodium: libraries at ${SODIUM_LIBRARY}")
+
+# LibUSB
+find_package(LibUSB)
+message(STATUS "libusb: include dir at ${LibUSB_INCLUDE_DIRS}")
+message(STATUS "libusb: libraries at ${LibUSB_LIBRARIES}")
+
+# HIDApi
+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)
+    set(Boost_DEBUG ON)
+endif()
+if(APPLE AND NOT BOOST_ROOT)
+  execute_process(COMMAND brew --prefix boost OUTPUT_VARIABLE BOOST_ROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+if(MINGW)
+  set(Boost_THREADAPI win32)
+endif()
+find_package(Boost 1.58 REQUIRED COMPONENTS
+		system
+		filesystem
+		thread
+		date_time
+		chrono
+		regex
+		serialization
+		program_options
+		locale)
+
+if(UNIX AND NOT APPLE AND NOT ANDROID)
+    set(CMAKE_SKIP_RPATH ON)
+    find_package(X11 REQUIRED)
+    message(STATUS "X11_FOUND = ${X11_FOUND}")
+    message(STATUS "X11_INCLUDE_DIR = ${X11_INCLUDE_DIR}")
+    message(STATUS "X11_LIBRARIES = ${X11_LIBRARIES}")
+    include_directories(${X11_INCLUDE_DIR})
+    link_directories(${X11_LIBRARIES})
+    if(STATIC)
+        find_library(XCB_LIBRARY xcb)
+        message(STATUS "Found xcb library: ${XCB_LIBRARY}")
+    endif()
+endif()
+
+if(MINGW)
+    string(REGEX MATCH "^[^/]:/[^/]*" msys2_install_path "${CMAKE_C_COMPILER}")
+    message(STATUS "MSYS location: ${msys2_install_path}")
+    set(CMAKE_INCLUDE_PATH "${msys2_install_path}/mingw${ARCH_WIDTH}/include")
+    # This is necessary because otherwise CMake will make Boost libraries -lfoo
+    # rather than a full path. Unfortunately, this makes the shared libraries get
+    # linked due to a bug in CMake which misses putting -static flags around the
+    # -lfoo arguments.
+    set(DEFLIB ${msys2_install_path}/mingw${ARCH_WIDTH}/lib)
+    list(REMOVE_ITEM CMAKE_C_IMPLICIT_LINK_DIRECTORIES ${DEFLIB})
+    list(REMOVE_ITEM CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES ${DEFLIB})
+endif()
+
+set(QT5_LIBRARIES
+  Qt5Core
+  Qt5Quick
+  Qt5Gui
+  Qt5Qml
+  Qt5Svg
+  Qt5Xml
+)
+
+if(WITH_SCANNER)
+  list(APPEND QT5_LIBRARIES Qt5Multimedia)
+endif()
+
+if(APPLE)
+  list(APPEND QT5_LIBRARIES Qt5MacExtras)
+endif()
+
+if(UNIX)
+  if(NOT CMAKE_PREFIX_PATH AND DEFINED ENV{CMAKE_PREFIX_PATH})
+    message(STATUS "Using CMAKE_PREFIX_PATH environment variable: '$ENV{CMAKE_PREFIX_PATH}'")
+    set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+  endif()
+  if(APPLE AND NOT CMAKE_PREFIX_PATH)
+    execute_process(COMMAND brew --prefix qt5 OUTPUT_VARIABLE QT5_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+    list(APPEND CMAKE_PREFIX_PATH ${QT5_DIR})
+  endif()
+
+  if(CMAKE_PREFIX_PATH)
+    include_directories(${CMAKE_PREFIX_PATH}/include)
+    set(CMAKE_BUILD_RPATH "${CMAKE_PREFIX_PATH}/lib")
+  endif()
+endif()
+
+find_package(PkgConfig REQUIRED)
+
+# TODO: drop this once we switch to Qt 5.14+
+pkg_check_modules(Qt5QmlModels_PKG_CONFIG QUIET Qt5QmlModels)
+if(Qt5QmlModels_PKG_CONFIG_FOUND)
+  list(APPEND QT5_LIBRARIES Qt5QmlModels)
+endif()
+
+# TODO: drop this once we switch to Qt 5.12+
+find_package(Qt5XmlPatterns QUIET)
+if(Qt5XmlPatterns_FOUND)
+  list(APPEND QT5_LIBRARIES Qt5XmlPatterns)
+endif()
+
+foreach(QT5_MODULE ${QT5_LIBRARIES})
+  find_package(${QT5_MODULE} REQUIRED)
+  include_directories(${${QT5_MODULE}_INCLUDE_DIRS})
+endforeach()
+
+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()
+
+if(QT5_PKG_CONFIG_FOUND)
+  set(QT5_PKG_CONFIG "QT5_PKG_CONFIG")
+  if(STATIC)
+    set(QT5_PKG_CONFIG "${QT5_PKG_CONFIG}_STATIC")
+  endif()
+
+  if(UNIX AND CMAKE_PREFIX_PATH)
+    if(APPLE)
+      list(JOIN ${QT5_PKG_CONFIG}_LDFLAGS_OTHER " " ${QT5_PKG_CONFIG}_LDFLAGS_OTHER)
+    endif()
+    # temporal workaround for https://bugreports.qt.io/browse/QTBUG-80922
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${CMAKE_PREFIX_PATH}" ${QT5_PKG_CONFIG}_LDFLAGS_OTHER "${${QT5_PKG_CONFIG}_LDFLAGS_OTHER}")
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${CMAKE_PREFIX_PATH}" ${QT5_PKG_CONFIG}_LIBRARIES "${${QT5_PKG_CONFIG}_LIBRARIES}")
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${CMAKE_PREFIX_PATH}" ${QT5_PKG_CONFIG}_INCLUDE_DIRS "${${QT5_PKG_CONFIG}_INCLUDE_DIRS}")
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${CMAKE_PREFIX_PATH}" ${QT5_PKG_CONFIG}_LIBRARY_DIRS "${${QT5_PKG_CONFIG}_LIBRARY_DIRS}")
+  endif()
+
+  set(QT5_LIBRARIES ${${QT5_PKG_CONFIG}_LIBRARIES} ${${QT5_PKG_CONFIG}_LDFLAGS_OTHER})
+  include_directories(${${QT5_PKG_CONFIG}_INCLUDE_DIRS})
+  link_directories(${${QT5_PKG_CONFIG}_LIBRARY_DIRS})
+endif()
+
+list(APPEND QT5_LIBRARIES
+  ${Qt5Gui_PLUGINS}
+  ${Qt5Svg_PLUGINS}
+  ${Qt5Qml_PLUGINS}
+  ${Qt5Network_PLUGINS}
+)
+
+if(STATIC)
+  set(QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/Qt/labs/folderlistmodel)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/Qt/labs/settings)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/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/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)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Dialogs)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Dialogs/Private)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Layouts)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/PrivateWidgets)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Templates.2)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Window.2)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/XmlListModel)
+
+  set(QT5_EXTRA_LIBRARIES_LIST
+    qtquicktemplates2plugin
+    Qt5QuickTemplates2
+    qtquickcontrols2plugin
+    Qt5QuickControls2
+    dialogplugin
+    dialogsprivateplugin
+    qmlfolderlistmodelplugin
+    qmlsettingsplugin
+    qmlxmllistmodelplugin
+    qquicklayoutsplugin
+  )
+
+  if(WITH_SCANNER)
+    list(APPEND QT5_EXTRA_LIBRARIES_LIST
+      declarative_multimedia
+      Qt5MultimediaQuick_p
+    )
+  endif()
+
+  list(APPEND QT5_EXTRA_LIBRARIES_LIST
+    qtgraphicaleffectsplugin
+    qtgraphicaleffectsprivate
+    qtquick2plugin
+    qtquickcontrolsplugin
+    widgetsplugin
+    windowplugin
+  )
+
+  set(QT5_EXTRA_LIBRARIES)
+  foreach(LIBRARY ${QT5_EXTRA_LIBRARIES_LIST})
+    find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS ${QT5_EXTRA_PATHS} REQUIRED)
+    list(APPEND QT5_EXTRA_LIBRARIES ${${LIBRARY}_LIBRARY})
+  endforeach()
+
+  if(MINGW)
+    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+      list(APPEND QT5_EXTRA_LIBRARIES D3D11 Dwrite D2d1)
+    endif()
+  endif()
+
+  set(QT5_LIBRARIES
+    ${QT5_EXTRA_LIBRARIES}
+    ${QT5_LIBRARIES}
+  )
+
+  set(QT5_INTEGRATION_LIBRARIES_LIST
+    Qt5EventDispatcherSupport
+    Qt5PacketProtocol
+    Qt5ThemeSupport
+    Qt5FontDatabaseSupport
+  )
+
+  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})
+    find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS ${QT5_EXTRA_PATHS} REQUIRED)
+    list(APPEND QT5_LIBRARIES ${${LIBRARY}_LIBRARY})
+  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})
+  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}")
+
+include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+if(MINGW)
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
+  set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt)
+  if(DEPENDS)
+    set(ICU_LIBRARIES icuio icui18n icuuc icudata icutu iconv)
+  else()
+    set(ICU_LIBRARIES icuio icuin icuuc icudt icutu iconv)
+  endif()
+elseif(APPLE)
+  set(EXTRA_LIBRARIES "-framework AppKit")
+elseif(OPENBSD OR ANDROID)
+  set(EXTRA_LIBRARIES "")
+elseif(FREEBSD)
+  set(EXTRA_LIBRARIES execinfo)
+elseif(DRAGONFLY)
+  find_library(COMPAT compat)
+  set(EXTRA_LIBRARIES execinfo ${COMPAT})
+elseif(CMAKE_SYSTEM_NAME MATCHES "(SunOS|Solaris)")
+  set(EXTRA_LIBRARIES socket nsl resolv)
+elseif(NOT MSVC AND NOT DEPENDS)
+  find_library(RT rt)
+  set(EXTRA_LIBRARIES ${RT})
+endif()
+
+list(APPEND EXTRA_LIBRARIES ${CMAKE_DL_LIBS})
+
+if(APPLE)
+  include_directories(SYSTEM /usr/include/malloc)
+  if(POLICY CMP0042)
+    cmake_policy(SET CMP0042 NEW)
+  endif()
+endif()
+
+if (APPLE AND NOT IOS)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -fvisibility=default -std=c++11")
+endif()
+
+if(APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -DGTEST_HAS_TR1_TUPLE=0")
+endif()
+
+# warnings
+add_c_flag_if_supported(-Werror C_SECURITY_FLAGS)
+add_cxx_flag_if_supported(-Werror CXX_SECURITY_FLAGS)
+add_c_flag_if_supported(-Wformat C_SECURITY_FLAGS)
+add_cxx_flag_if_supported(-Wformat CXX_SECURITY_FLAGS)
+add_c_flag_if_supported(-Wformat-security C_SECURITY_FLAGS)
+add_cxx_flag_if_supported(-Wformat-security CXX_SECURITY_FLAGS)
+
+# -fstack-protector
+if (NOT OPENBSD AND NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1)))
+  add_c_flag_if_supported(-fstack-protector C_SECURITY_FLAGS)
+  add_cxx_flag_if_supported(-fstack-protector CXX_SECURITY_FLAGS)
+  add_c_flag_if_supported(-fstack-protector-strong C_SECURITY_FLAGS)
+  add_cxx_flag_if_supported(-fstack-protector-strong CXX_SECURITY_FLAGS)
+endif()
+
+# New in GCC 8.2
+if (NOT OPENBSD AND NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1)))
+  add_c_flag_if_supported(-fcf-protection=full C_SECURITY_FLAGS)
+  add_cxx_flag_if_supported(-fcf-protection=full CXX_SECURITY_FLAGS)
+endif()
+if (NOT WIN32 AND NOT OPENBSD)
+  add_c_flag_if_supported(-fstack-clash-protection C_SECURITY_FLAGS)
+  add_cxx_flag_if_supported(-fstack-clash-protection CXX_SECURITY_FLAGS)
+endif()
+
+# Removed in GCC 9.1 (or before ?), but still accepted, so spams the output
+if (NOT (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 9.1))
+  add_c_flag_if_supported(-mmitigate-rop C_SECURITY_FLAGS)
+  add_cxx_flag_if_supported(-mmitigate-rop CXX_SECURITY_FLAGS)
+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)
+endif()
+add_linker_flag_if_supported(-Wl,-z,relro LD_SECURITY_FLAGS)
+add_linker_flag_if_supported(-Wl,-z,now LD_SECURITY_FLAGS)
+add_linker_flag_if_supported(-Wl,-z,noexecstack noexecstack_SUPPORTED)
+if (noexecstack_SUPPORTED)
+  set(LD_SECURITY_FLAGS "${LD_SECURITY_FLAGS} -Wl,-z,noexecstack")
+endif()
+add_linker_flag_if_supported(-Wl,-z,noexecheap noexecheap_SUPPORTED)
+if (noexecheap_SUPPORTED)
+  set(LD_SECURITY_FLAGS "${LD_SECURITY_FLAGS} -Wl,-z,noexecheap")
+endif()
+
+# some windows linker bits
+if (WIN32)
+  add_linker_flag_if_supported(-Wl,--dynamicbase LD_SECURITY_FLAGS)
+  add_linker_flag_if_supported(-Wl,--nxcompat LD_SECURITY_FLAGS)
+  add_linker_flag_if_supported(-Wl,--high-entropy-va LD_SECURITY_FLAGS)
+endif()
+
+if(STATIC)
+  add_linker_flag_if_supported(-static-libgcc STATIC_FLAGS)
+  add_linker_flag_if_supported(-static-libstdc++ STATIC_FLAGS)
+  if(MINGW)
+    add_linker_flag_if_supported(-static STATIC_FLAGS)
+  endif()
+endif()
+
+# With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
+# is fixed in the code (Issue #847), force compiler to be conservative.
+add_c_flag_if_supported(-fno-strict-aliasing C_SECURITY_FLAGS)
+add_cxx_flag_if_supported(-fno-strict-aliasing CXX_SECURITY_FLAGS)
+
+add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
+add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
+
+message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
+message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
+
+if (HIDAPI_FOUND OR LibUSB_COMPILE_TEST_PASSED)
+  if (APPLE)
+    if(DEPENDS)
+      list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework IOKit")
+    else()
+      find_library(COREFOUNDATION CoreFoundation)
+      find_library(IOKIT IOKit)
+      list(APPEND EXTRA_LIBRARIES ${IOKIT})
+      list(APPEND EXTRA_LIBRARIES ${COREFOUNDATION})
+    endif()
+  endif()
+  if (WIN32)
+    find_library(VERSION_LIBRARY version PATHS /usr/x86_64-w64-mingw32/lib)
+    if(VERSION_LIBRARY STREQUAL "VERSION_LIBRARY-NOTFOUND")
+      set(VERSION_LIBRARY Version)
+    endif()
+    list(APPEND EXTRA_LIBRARIES setupapi ${VERSION_LIBRARY})
+  endif()
+endif()
+
+add_subdirectory(translations)
+
+add_subdirectory(src)

DEPLOY.md

@@ -0,0 +1,42 @@
+# macOS:
+
+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 hidapi`
+
+2. 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. `CMAKE_PREFIX_PATH=~/Qt5.12.8/5.12.8/clang_64 make release`
+
+5. `cd build/release && make deploy`
+
+6. Replace the `monerod` binary inside `monero-wallet-gui.app/Contents/MacOS/` with one built using deterministic builds / gitian.
+
+## Codesigning and notarizing
+
+1. Save the following text as `entitlements.plist`
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>com.apple.security.cs.disable-executable-page-protection</key>
+        <true/>
+</dict>
+</plist>
+```
+
+2. `codesign --deep --force --verify --verbose --options runtime --timestamp --entitlements entitlements.plist --sign 'XXXXXXXXXX' monero-wallet-gui.app`
+
+You can check if this step worked by using `codesign -dvvv monero-wallet-gui.app`
+
+3. `hdiutil create -fs HFS+ -srcfolder monero-gui-v0.X.Y.Z -volname monero-wallet-gui monero-gui-mac-x64-v0.X.Y.Z.dmg`
+
+4. `xcrun altool -t osx --file monero-gui-mac-x64-v0.X.Y.Z.dmg --primary-bundle-id org.monero-project.monero-wallet-gui.dmg --notarize-app --username email@address.org`
+
+5. `xcrun altool --notarization-info aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee -u email@address.org`
+
+6. `xcrun stapler staple -v monero-gui-mac-x64-v0.X.Y.Z.dmg`

Dockerfile.android

@@ -0,0 +1,217 @@
+FROM debian:unstable
+
+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 cmake file gettext git libc6 libncurses5 \
+    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 https://github.com/ZBar/ZBar.git --depth 1 \
+    && cd ZBar \
+    && git reset --hard 854a5d97059e395807091ac4d80c53f7968abb8f \
+    && sed -i 's/SHARED/STATIC/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CPP_FEATURES := exceptions rtti features\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS := -Wno-multichar\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -D_ANDROID\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -DLIBDIR="\\".\\""\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -DBUILDING_LIBICONV\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -DBUILDING_LIBCHARSET\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -DIN_LIBRARY\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -fno-stack-protector\n\0/' android/jni/Android.mk \
+    && echo "APP_ABI := arm64-v8a \nAPP_STL := c++_shared \nTARGET_PLATFORM := ${ANDROID_API} \nTARGET_ARCH_ABI := arm64-v8a \nAPP_CFLAGS +=  -target aarch64-none-linux-android -fexceptions -fstack-protector-strong -fno-limit-debug-info -mfloat-abi=softfp -fno-builtin-memmove -fno-omit-frame-pointer -fno-stack-protector\n" \
+       >> android/jni/Application.mk \
+    && cd android \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ${ANDROID_NDK_ROOT}/ndk-build ICONV_SRC=${WORKDIR}/libiconv-${ICONV_VERSION} -B V=1 NDK_APPLICATION_MK=jni/Application.mk \
+    && cp obj/local/arm64-v8a/lib* ${PREFIX}/lib \
+    && cp -r ../include/* ${PREFIX}/include
+
+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
+
+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,208 @@
+FROM ubuntu:16.04
+
+ARG THREADS=1
+
+ENV CFLAGS="-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 --disable-shared --enable-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 --disable-shared --enable-static && \
+    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 libxkbcommon-dev && \
+    wget https://download.qt.io/archive/qt/5.9/5.9.9/single/qt-everywhere-opensource-src-5.9.9.tar.xz && \
+    echo "5ce285209290a157d7f42ec8eb22bf3f1d76f2e03a95fc0b99b553391be01642 qt-everywhere-opensource-src-5.9.9.tar.xz" | sha256sum -c && \
+    tar -xf qt-everywhere-opensource-src-5.9.9.tar.xz && \
+    rm qt-everywhere-opensource-src-5.9.9.tar.xz && \
+    cd qt-everywhere-opensource-src-5.9.9 && \
+    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 && \
+    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 git clone -b libX11-1.6.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libx11 && \
+    cd libx11 && \
+    git reset --hard db7cca17ad7807e92a928da9d4c68a00f4836da2 && \
+    ./autogen.sh --disable-shared --enable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b libXext-1.3.4 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxext && \
+    cd libxext && \
+    git reset --hard ebb167f34a3514783966775fb12573c4ed209625 && \
+    ./autogen.sh --disable-shared --enable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN apt install -y libsodium-dev && \
+    git clone -b v4.3.2 --depth 1 https://github.com/zeromq/libzmq && \
+    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 apt install -y cmake libusb-1.0-0-dev

Dockerfile.windows

@@ -0,0 +1,71 @@
+FROM ubuntu:20.04
+
+ARG THREADS=1
+
+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 curl -LO https://download.qt.io/archive/qt/5.9/5.9.9/single/qt-everywhere-opensource-src-5.9.9.tar.xz && \
+    echo "5ce285209290a157d7f42ec8eb22bf3f1d76f2e03a95fc0b99b553391be01642 qt-everywhere-opensource-src-5.9.9.tar.xz" > hashsum.txt && \
+    sha256sum -c hashsum.txt && \
+    tar -xf qt-everywhere-opensource-src-5.9.9.tar.xz && \
+    rm qt-everywhere-opensource-src-5.9.9.tar.xz && \
+    cd qt-everywhere-opensource-src-5.9.9 && \
+    ./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 \
+    -qt-freetype -qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \
+    -skip gamepad -skip location -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcanvas3d -skip qtcharts \
+    -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtmacextras \
+    -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtscript -skip qtscxml -skip qtsensors \
+    -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttools -skip qtvirtualkeyboard -skip qtwayland \
+    -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtwinextras -skip qtx11extras \
+    -skip serialbus -skip webengine \
+    -nomake examples -nomake tests -nomake tools && \
+    make QMAKE="$(pwd)/qtbase/bin/qmake CONFIG-='debug debug_and_release'" -j$THREADS && \
+    make -j$THREADS 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

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -26,28 +26,35 @@
 // 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.2
+import QtQuick 2.9
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 import moneroComponents.Wallet 1.0
 import moneroComponents.NetworkType 1.0
-import "components"
+import moneroComponents.Clipboard 1.0
+import FontAwesome 1.0
+
+import "components" as MoneroComponents
+import "components/effects/" as MoneroEffects
 
 Rectangle {
     id: panel
 
-    property alias unlockedBalanceText: unlockedBalanceText.text
-    property alias unlockedBalanceVisible: unlockedBalanceText.visible
-    property alias unlockedBalanceLabelVisible: unlockedBalanceLabel.visible
-    property alias balanceLabelText: balanceLabel.text
-    property alias balanceText: balanceText.text
+    property int currentAccountIndex
+    property alias currentAccountLabel: accountLabel.text
+    property string balanceString: "?.??"
+    property string balanceUnlockedString: "?.??"
+    property string balanceFiatString: "?.??"
+    property string minutesToUnlock: ""
+    property bool isSyncing: false
     property alias networkStatus : networkStatus
     property alias progressBar : progressBar
     property alias daemonProgressBar : daemonProgressBar
-    property alias minutesToUnlockTxt: unlockedBalanceLabel.text
-    property int titleBarHeight: 50
 
-    signal dashboardClicked()
+    property int titleBarHeight: 50
+    property string copyValue: ""
+    Clipboard { id: clipboard }
+
     signal historyClicked()
     signal transferClicked()
     signal receiveClicked()
@@ -57,12 +64,11 @@ Rectangle {
     signal addressBookClicked()
     signal miningClicked()
     signal signClicked()
-    signal keysClicked()
+    signal accountClicked()
 
     function selectItem(pos) {
         menuColumn.previousButton.checked = false
-        if(pos === "Dashboard") menuColumn.previousButton = dashboardButton
-        else if(pos === "History") menuColumn.previousButton = historyButton
+        if(pos === "History") menuColumn.previousButton = historyButton
         else if(pos === "Transfer") menuColumn.previousButton = transferButton
         else if(pos === "Receive")  menuColumn.previousButton = receiveButton
         else if(pos === "AddressBook") menuColumn.previousButton = addressBookButton
@@ -72,22 +78,27 @@ Rectangle {
         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
         menuColumn.previousButton.checked = true
     }
 
-    width: (isMobile)? appWindow.width : 300
+    width: 300
     color: "transparent"
     anchors.bottom: parent.bottom
     anchors.top: parent.top
 
-    Image {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        height: panel.height
-        source: "images/leftPanelBg.jpg"
-        z: 1
+    MoneroEffects.GradientBackground {
+        anchors.fill: parent
+        fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor
+        initialStartColor: MoneroComponents.Style.leftPanelBackgroundGradientStart
+        initialStopColor: MoneroComponents.Style.leftPanelBackgroundGradientStop
+        blackColorStart: MoneroComponents.Style._b_leftPanelBackgroundGradientStart
+        blackColorStop: MoneroComponents.Style._b_leftPanelBackgroundGradientStop
+        whiteColorStart: MoneroComponents.Style._w_leftPanelBackgroundGradientStart
+        whiteColorStop: MoneroComponents.Style._w_leftPanelBackgroundGradientStop
+        posStart: 0.6
+        start: Qt.point(0, 0)
+        end: Qt.point(height, width)
     }
 
     // card with monero logo
@@ -95,30 +106,43 @@ Rectangle {
         visible: true
         z: 2
         id: column1
-        height: 200
+        height: 175
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.top: parent.top
         anchors.topMargin: (persistentSettings.customDecorations)? 50 : 0
 
-        RowLayout {
-            visible: true
+        Item {
             Item {
                 anchors.left: parent.left
                 anchors.top: parent.top
                 anchors.topMargin: 20
                 anchors.leftMargin: 20
-                anchors.verticalCenter: parent.verticalCenter
-                height: 490 * scaleRatio
-                width: 259 * scaleRatio
+                height: 490
+                width: 260
 
                 Image {
-                    width: 259; height: 170
+                    id: card
+                    visible: !isOpenGL || MoneroComponents.Style.blackTheme
+                    width: 260
+                    height: 135
                     fillMode: Image.PreserveAspectFit
-                    source: "images/card-background.png"
+                    source: MoneroComponents.Style.blackTheme ? "qrc:///images/card-background-black.png" : "qrc:///images/card-background-white.png"
                 }
 
-                Text {
+                DropShadow {
+                    visible: isOpenGL && !MoneroComponents.Style.blackTheme
+                    anchors.fill: card
+                    horizontalOffset: 3
+                    verticalOffset: 3
+                    radius: 10.0
+                    samples: 15
+                    color: "#3B000000"
+                    source: card
+                    cached: true
+                }
+
+                MoneroComponents.TextPlain {
                     id: testnetLabel
                     visible: persistentSettings.nettype != NetworkType.MAINNET
                     text: (persistentSettings.nettype == NetworkType.TESTNET ? qsTr("Testnet") : qsTr("Stagenet")) + translationManager.emptyString
@@ -129,9 +153,10 @@ Rectangle {
                     font.bold: true
                     font.pixelSize: 12
                     color: "#f33434"
+                    themeTransition: false
                 }
 
-                Text {
+                MoneroComponents.TextPlain {
                     id: viewOnlyLabel
                     visible: viewOnly
                     text: qsTr("View Only") + translationManager.emptyString
@@ -142,6 +167,7 @@ Rectangle {
                     font.pixelSize: 12
                     font.bold: true
                     color: "#ff9323"
+                    themeTransition: false
                 }
             }
 
@@ -150,91 +176,154 @@ Rectangle {
                 anchors.top: parent.top
                 anchors.topMargin: 20
                 anchors.leftMargin: 20
-                anchors.verticalCenter: parent.verticalCenter
-                height: 490 * scaleRatio
-                width: 50 * scaleRatio
+                height: 490
+                width: 50
 
-                Text {
-                    visible: !isMobile
-                    id: balanceText
+                MoneroComponents.Label {
+                    fontSize: 12
+                    id: accountIndex
+                    text: qsTr("Account") + translationManager.emptyString + " #" + currentAccountIndex
+                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
                     anchors.left: parent.left
-                    anchors.leftMargin: 20
+                    anchors.leftMargin: 60
                     anchors.top: parent.top
-                    anchors.topMargin: 76
-                    font.family: "Arial"
-                    color: "#FFFFFF"
-                    text: "N/A"
-                    // dynamically adjust text size
-                    font.pixelSize: {
-                        var digits = text.split('.')[0].length
-                        var defaultSize = 22;
-                        if(digits > 2) {
-                            return defaultSize - 1.1*digits
-                        }
-                        return defaultSize;
+                    anchors.topMargin: 23
+                    themeTransition: false
+
+                    MouseArea{
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: appWindow.showPageRequest("Account")
                     }
                 }
 
-                Text {
-                    id: unlockedBalanceText
-                    visible: true
+                MoneroComponents.Label {
+                    fontSize: 16
+                    id: accountLabel
+                    textWidth: 170
+                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
                     anchors.left: parent.left
-                    anchors.leftMargin: 20
+                    anchors.leftMargin: 60
                     anchors.top: parent.top
-                    anchors.topMargin: 126
-                    font.family: "Arial"
-                    color: "#FFFFFF"
-                    text: "N/A"
-                    // dynamically adjust text size
-                    font.pixelSize: {
-                        var digits = text.split('.')[0].length
-                        var defaultSize = 20;
-                        if(digits > 3) {
-                            return defaultSize - 0.6*digits
-                        }
-                        return defaultSize;
+                    anchors.topMargin: 36
+                    themeTransition: false
+                    elide: Text.ElideRight
+
+                    MouseArea {
+                        hoverEnabled: true
+                        anchors.fill: parent
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: appWindow.showPageRequest("Account")
                     }
                 }
 
-                Label {
-                    id: unlockedBalanceLabel
-                    visible: true
-                    text: qsTr("Unlocked balance") + translationManager.emptyString
+                MoneroComponents.Label {
+                    fontSize: 16
+                    visible: isSyncing
+                    text: qsTr("Syncing...") + translationManager.emptyString
+                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
                     anchors.left: parent.left
                     anchors.leftMargin: 20
-                    anchors.top: parent.top
-                    anchors.topMargin: 110
+                    anchors.bottom: currencyLabel.top
+                    anchors.bottomMargin: 15
+                    themeTransition: false
                 }
 
-                Label {
-                    visible: !isMobile
-                    id: balanceLabel
-                    text: qsTr("Balance") + translationManager.emptyString
-                    fontSize: 14
+                MoneroComponents.TextPlain {
+                    id: currencyLabel
+                    font.pixelSize: 16
+                    text: {
+                        if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) {
+                            return appWindow.fiatApiCurrencySymbol();
+                        } else {
+                            return "XMR"
+                        }
+                    }
+                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
                     anchors.left: parent.left
                     anchors.leftMargin: 20
                     anchors.top: parent.top
-                    anchors.topMargin: 60
+                    anchors.topMargin: 100
+                    themeTransition: false
+
+                    MouseArea {
+                        hoverEnabled: true
+                        anchors.fill: parent
+                        visible: persistentSettings.fiatPriceEnabled
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: persistentSettings.fiatPriceToggle = !persistentSettings.fiatPriceToggle
+                    }
                 }
+
+                MoneroComponents.TextPlain {
+                    id: balancePart1
+                    themeTransition: false
+                    anchors.left: parent.left
+                    anchors.leftMargin: 58
+                    anchors.baseline: currencyLabel.baseline
+                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
+                    Binding on color {
+                        when: balancePart1MouseArea.containsMouse || balancePart2MouseArea.containsMouse
+                        value: MoneroComponents.Style.orange
+                    }
+                    text: {
+                        if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) {
+                            return balanceFiatString.split('.')[0] + "."
+                        } else {
+                            return balanceString.split('.')[0] + "."
+                        }
+                    }
+                    font.pixelSize: {
+                        var defaultSize = 29;
+                        var digits = (balancePart1.text.length - 1)
+                        if (digits > 2 && !(persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle)) {
+                            return defaultSize - 1.1 * digits
+                        } else {
+                            return defaultSize
+                        }
+                    }
+                    MouseArea {
+                        id: balancePart1MouseArea
+                        hoverEnabled: true
+                        anchors.fill: parent
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                                console.log("Copied to clipboard");
+                                clipboard.setText(balancePart1.text + balancePart2.text);
+                                appWindow.showStatusMessage(qsTr("Copied to clipboard"),3)
+                        }
+                    }
+                }
+                MoneroComponents.TextPlain {
+                    id: balancePart2
+                    themeTransition: false
+                    anchors.left: balancePart1.right
+                    anchors.leftMargin: 2
+                    anchors.baseline: currencyLabel.baseline
+                    color: balancePart1.color
+                    text: {
+                        if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) {
+                            return balanceFiatString.split('.')[1]
+                        } else {
+                            return balanceString.split('.')[1]
+                        }
+                    }
+                    font.pixelSize: 16
+                    MouseArea {
+                        id: balancePart2MouseArea
+                        hoverEnabled: true
+                        anchors.fill: parent
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: balancePart1MouseArea.clicked(mouse)
+                    }
+                }
+
                 Item { //separator
                     anchors.left: parent.left
                     anchors.right: parent.right
                     height: 1
                 }
-              /* Disable twitter/news panel
-                Image {
-                    anchors.left: parent.left
-                    anchors.verticalCenter: logo.verticalCenter
-                    anchors.leftMargin: 19
-                    source: appWindow.rightPanelExpanded ? "images/expandRightPanel.png" :
-                                                           "images/collapseRightPanel.png"
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: appWindow.rightPanelExpanded = !appWindow.rightPanelExpanded
-                }
-              */
             }
         }
     }
@@ -245,22 +334,19 @@ Rectangle {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.bottom: parent.bottom
-        anchors.top: (isMobile)? parent.top : column1.bottom
-        anchors.topMargin: (isMobile)? 0 : 32
+        anchors.top: column1.bottom
         color: "transparent"
 
-
         Flickable {
             id:flicker
-            contentHeight: (progressBar.visible)? menuColumn.height + separator.height + 
-                networkStatus.height + progressBar.height + daemonProgressBar.height : 
-                menuColumn.height + separator.height + networkStatus.height
-            anchors.fill: parent
+            contentHeight: menuColumn.height
+            anchors.top: parent.top
+            anchors.bottom: progressBar.visible ? progressBar.top : networkStatus.top
+            width: parent.width
+            boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
             clip: true
 
-
         Column {
-
             id: menuColumn
             anchors.left: parent.left
             anchors.right: parent.right
@@ -268,51 +354,41 @@ Rectangle {
             clip: true
             property var previousButton: transferButton
 
-            // ------------- Dashboard tab ---------------
-
-            /*
-            MenuButton {
-                id: dashboardButton
+            // top border
+            MoneroComponents.MenuButtonDivider {
                 anchors.left: parent.left
                 anchors.right: parent.right
-                text: qsTr("Dashboard") + translationManager.emptyString
-                symbol: qsTr("D") + translationManager.emptyString
-                dotColor: "#FFE00A"
-                checked: true
+                anchors.leftMargin: 20
+            }
+
+            // ------------- Account tab ---------------
+            MoneroComponents.MenuButton {
+                id: accountButton
+                anchors.left: parent.left
+                anchors.right: parent.right
+                text: qsTr("Account") + translationManager.emptyString
+                symbol: qsTr("T") + translationManager.emptyString
                 onClicked: {
                     parent.previousButton.checked = false
-                    parent.previousButton = dashboardButton
-                    panel.dashboardClicked()
+                    parent.previousButton = accountButton
+                    panel.accountClicked()
                 }
             }
 
-
-            Rectangle {
+            MoneroComponents.MenuButtonDivider {
+                visible: accountButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: dashboardButton.checked || transferButton.checked ? "#1C1C1C" : "#313131"
-                height: 1
-            }
-            */
-
-            // top border
-            Rectangle {
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
+                anchors.leftMargin: 20
             }
 
             // ------------- Transfer tab ---------------
-            MenuButton {
+            MoneroComponents.MenuButton {
                 id: transferButton
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Send") + translationManager.emptyString
                 symbol: qsTr("S") + translationManager.emptyString
-                dotColor: "#FF6C3C"
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = transferButton
@@ -320,24 +396,21 @@ Rectangle {
                 }
             }
 
-            Rectangle {
+            MoneroComponents.MenuButtonDivider {
                 visible: transferButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
+                anchors.leftMargin: 20
             }
 
             // ------------- AddressBook tab ---------------
 
-            MenuButton {
+            MoneroComponents.MenuButton {
                 id: addressBookButton
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Address book") + translationManager.emptyString
                 symbol: qsTr("B") + translationManager.emptyString
-                dotColor: "#FF4F41"
                 under: transferButton
                 onClicked: {
                     parent.previousButton.checked = false
@@ -346,93 +419,85 @@ Rectangle {
                 }
             }
 
-            Rectangle {
+            MoneroComponents.MenuButtonDivider {
                 visible: addressBookButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
+                anchors.leftMargin: 20
             }
 
             // ------------- Receive tab ---------------
-            MenuButton {
+            MoneroComponents.MenuButton {
                 id: receiveButton
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Receive") + translationManager.emptyString
                 symbol: qsTr("R") + translationManager.emptyString
-                dotColor: "#AAFFBB"
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = receiveButton
                     panel.receiveClicked()
                 }
             }
-            Rectangle {
+
+            MoneroComponents.MenuButtonDivider {
                 visible: receiveButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
+                anchors.leftMargin: 20
             }
 
             // ------------- History tab ---------------
 
-            MenuButton {
+            MoneroComponents.MenuButton {
                 id: historyButton
                 anchors.left: parent.left
                 anchors.right: parent.right
-                text: qsTr("History") + translationManager.emptyString
+                text: qsTr("Transactions") + translationManager.emptyString
                 symbol: qsTr("H") + translationManager.emptyString
-                dotColor: "#6B0072"
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = historyButton
                     panel.historyClicked()
                 }
             }
-            Rectangle {
+
+            MoneroComponents.MenuButtonDivider {
                 visible: historyButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
+                anchors.leftMargin: 20
             }
 
             // ------------- Advanced tab ---------------
-            MenuButton {
+            MoneroComponents.MenuButton {
                 id: advancedButton
+                visible: appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Advanced") + translationManager.emptyString
                 symbol: qsTr("D") + translationManager.emptyString
-                dotColor: "#FFD781"
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = advancedButton
                 }
             }
-            Rectangle {
-                visible: advancedButton.present
+
+            MoneroComponents.MenuButtonDivider {
+                visible: advancedButton.present && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
+                anchors.leftMargin: 20
             }
 
             // ------------- Mining tab ---------------
-            MenuButton {
+            MoneroComponents.MenuButton {
                 id: miningButton
-                visible: !isAndroid && !isIOS
+                visible: !isAndroid && !isIOS && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Mining") + translationManager.emptyString
                 symbol: qsTr("M") + translationManager.emptyString
-                dotColor: "#FFD781"
                 under: advancedButton
                 onClicked: {
                     parent.previousButton.checked = false
@@ -441,22 +506,21 @@ Rectangle {
                 }
             }
 
-            Rectangle {
-                visible: miningButton.present
+            MoneroComponents.MenuButtonDivider {
+                visible: miningButton.present && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: miningButton.checked || settingsButton.checked ? "#1C1C1C" : "#313131"
-                height: 1
+                anchors.leftMargin: 20
             }
+
             // ------------- TxKey tab ---------------
-            MenuButton {
+            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
-                dotColor: "#FFD781"
                 under: advancedButton
                 onClicked: {
                     parent.previousButton.checked = false
@@ -464,22 +528,22 @@ Rectangle {
                     panel.txkeyClicked()
                 }
             }
-            Rectangle {
-                visible: txkeyButton.present
+
+            MoneroComponents.MenuButtonDivider {
+                visible: txkeyButton.present && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
+                anchors.leftMargin: 20
             }
+
             // ------------- Shared RingDB tab ---------------
-            MenuButton {
+            MoneroComponents.MenuButton {
                 id: sharedringdbButton
+                visible: appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Shared RingDB") + translationManager.emptyString
-                symbol: qsTr("A") + translationManager.emptyString
-                dotColor: "#FFD781"
+                symbol: qsTr("G") + translationManager.emptyString
                 under: advancedButton
                 onClicked: {
                     parent.previousButton.checked = false
@@ -487,24 +551,22 @@ Rectangle {
                     panel.sharedringdbClicked()
                 }
             }
-            Rectangle {
-                visible: sharedringdbButton.present
+
+            MoneroComponents.MenuButtonDivider {
+                visible: sharedringdbButton.present && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
+                anchors.leftMargin: 20
             }
 
-
             // ------------- Sign/verify tab ---------------
-            MenuButton {
+            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
-                dotColor: "#FFD781"
                 under: advancedButton
                 onClicked: {
                     parent.previousButton.checked = false
@@ -512,58 +574,33 @@ Rectangle {
                     panel.signClicked()
                 }
             }
-            Rectangle {
-                visible: signButton.present
+
+            MoneroComponents.MenuButtonDivider {
+                visible: signButton.present && appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
+                anchors.leftMargin: 20
             }
+
             // ------------- Settings tab ---------------
-            MenuButton {
+            MoneroComponents.MenuButton {
                 id: settingsButton
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Settings") + translationManager.emptyString
                 symbol: qsTr("E") + translationManager.emptyString
-                dotColor: "#36B25C"
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = settingsButton
                     panel.settingsClicked()
                 }
             }
-            Rectangle {
+
+            MoneroComponents.MenuButtonDivider {
                 visible: settingsButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
-            }
-            // ------------- Sign/verify tab ---------------
-            MenuButton {
-                id: keysButton
-                anchors.left: parent.left
-                anchors.right: parent.right
-                text: qsTr("Seed & Keys") + translationManager.emptyString
-                symbol: qsTr("Y") + translationManager.emptyString
-                dotColor: "#FFD781"
-                under: settingsButton
-                onClicked: {
-                    parent.previousButton.checked = false
-                    parent.previousButton = keysButton
-                    panel.keysClicked()
-                }
-            }
-            Rectangle {
-                visible: settingsButton.present
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.leftMargin: 16
-                color: "#313131"
-                height: 1
+                anchors.leftMargin: 20
             }
 
         } // Column
@@ -576,51 +613,41 @@ Rectangle {
             anchors.right: parent.right
             anchors.leftMargin: 0
             anchors.rightMargin: 0
-            anchors.bottom: networkStatus.top;
-            height: 10 * scaleRatio
+            anchors.bottom: progressBar.visible ? progressBar.top : networkStatus.top
+            height: 10
             color: "transparent"
         }
 
-        NetworkStatusItem {
-            id: networkStatus
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.leftMargin: 0
-            anchors.rightMargin: 0
-            anchors.bottom: (progressBar.visible)? progressBar.top : parent.bottom;
-            connected: Wallet.ConnectionStatus_Disconnected
-            height: 48 * scaleRatio
-        }
-
-        ProgressBar {
+        MoneroComponents.ProgressBar {
             id: progressBar
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.bottom: daemonProgressBar.top
-            height: 48 * scaleRatio
-            syncType: qsTr("Wallet")
-            visible: networkStatus.connected
+            height: 48
+            syncType: qsTr("Wallet") + translationManager.emptyString
+            visible: !appWindow.disconnected
         }
 
-        ProgressBar {
+        MoneroComponents.ProgressBar {
             id: daemonProgressBar
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            syncType: qsTr("Daemon")
-            visible: networkStatus.connected
-            height: 62 * scaleRatio
+            anchors.bottom: networkStatus.top
+            syncType: qsTr("Daemon") + translationManager.emptyString
+            visible: !appWindow.disconnected
+            height: 62
         }
-    } // menuRect
-
-
-
-    // indicate disabled state
-//    Desaturate {
-//        anchors.fill: parent
-//        source: parent
-//        desaturation: panel.enabled ? 0.0 : 1.0
-//    }
-
-
+        
+        MoneroComponents.NetworkStatusItem {
+            id: networkStatus
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.leftMargin: 5
+            anchors.rightMargin: 0
+            anchors.bottom: parent.bottom
+            anchors.bottomMargin: 5
+            connected: Wallet.ConnectionStatus_Disconnected
+            height: 48
+        }
+    }
 }

Logger.cpp

@@ -1,49 +0,0 @@
-#include <QCoreApplication>
-#include <QStandardPaths>
-#include <QFileInfo>
-#include <QString>
-
-#include "Logger.h"
-#include "wallet/api/wallet2_api.h"
-
-// default log path by OS (should be writable)
-static const QString default_name = "monero-wallet-gui.log";
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-    static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).at(0);
-#elif defined(Q_OS_WIN)
-    static const QString osPath = QCoreApplication::applicationDirPath();
-#elif defined(Q_OS_MAC)
-    static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs";
-#else // linux + bsd
-    static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
-#endif
-
-
-// return the absolute path of the logfile
-const QString getLogPath(const QString logPath)
-{
-    const QFileInfo fi(logPath);
-
-    if(!logPath.isEmpty() && !fi.isDir())
-        return fi.absoluteFilePath();
-    else
-        return osPath + "/" + default_name;
-}
-
-
-// custom messageHandler that foward all messages to easylogging
-void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message)
-{
-    (void) context; // context isn't used in release builds
-    const std::string cat = "frontend"; // category displayed in the log
-    const std::string msg = message.toStdString();
-    switch(type)
-    {
-        case QtDebugMsg: Monero::Wallet::debug(cat, msg); break;
-        case QtInfoMsg: Monero::Wallet::info(cat, msg); break;
-        case QtWarningMsg: Monero::Wallet::warning(cat, msg); break;
-        case QtCriticalMsg: Monero::Wallet::error(cat, msg); break;
-        case QtFatalMsg: Monero::Wallet::error(cat, msg); break;
-    }
-}
-

Logger.h

@@ -1,8 +0,0 @@
-#ifndef LOGGER_H
-#define LOGGER_H
-
-const QString getLogPath(const QString logPath);
-void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);
-
-#endif // LOGGER_H
-

MainApp.cpp

@@ -1,14 +0,0 @@
-#include "MainApp.h"
-#include <QCloseEvent>
-
-bool MainApp::event (QEvent *event)
-{
-    // Catch application exit event and signal to qml app to handle exit
-    if(event->type() == QEvent::Close) {
-        event->ignore();
-        emit closing();
-        return true;
-    }
-
-    return false;
-}

MainApp.h

@@ -1,18 +0,0 @@
-#ifndef MAINAPP_H
-#define MAINAPP_H
-#include <QApplication>
-
-class MainApp : public QApplication
-{
-    Q_OBJECT
-public:
-    MainApp(int &argc, char** argv) : QApplication(argc, argv) {};
-private:
-    bool event(QEvent *e);
-signals:
-    void closing();
-};
-
-#endif // MAINAPP_H
-
-

Makefile

@@ -0,0 +1,58 @@
+ANDROID_STANDALONE_TOOLCHAIN_PATH ?= /usr/local/toolchain
+MANUAL_SUBMODULES ?= OFF
+
+dotgit=$(shell ls -d .git/config)
+ifneq ($(dotgit), .git/config)
+  USE_SINGLE_BUILDDIR=1
+endif
+
+subbuilddir:=$(shell echo  `uname | sed -e 's|[:/\\ \(\)]|_|g'`/`git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g'`)
+ifeq ($(USE_SINGLE_BUILDDIR), OFF)
+  builddir := build/"$(subbuilddir)"
+  topdir   := ../../../..
+  deldirs  := $(builddir)
+else
+  builddir := build
+  topdir   := ../..
+  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) -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) -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) -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) -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) -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) -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) -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) -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) -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) -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

@@ -28,33 +28,34 @@
 
 
 import QtQml 2.0
-import QtQuick 2.2
-// QtQuick.Controls 2.0 isn't stable enough yet. Needs more testing.
-//import QtQuick.Controls 2.0
+import QtQuick 2.9
+import QtQuick.Controls 2.0
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 import moneroComponents.Wallet 1.0
 
 import "./pages"
+import "./pages/settings"
+import "./pages/merchant"
+import "./components" as MoneroComponents
+import "./components/effects/" as MoneroEffects
 
 Rectangle {
     id: root
 
     property Item currentView
     property Item previousView
-    property bool basicMode : isMobile
-    property string balanceLabelText: qsTr("Balance") + translationManager.emptyString
-    property string balanceText
-    property string unlockedBalanceLabelText: qsTr("Unlocked Balance") + translationManager.emptyString
-    property string unlockedBalanceText
-    property int minHeight: (appWindow.height > 800) ? appWindow.height : 800 * scaleRatio
+    property int minHeight: (appWindow.height > 800) ? appWindow.height : 800
     property alias contentHeight: mainFlickable.contentHeight
     property alias flickable: mainFlickable
-//    property int headerHeight: header.height
 
-    property Transfer transferView: Transfer { }
+    property Transfer transferView: Transfer {
+        onPaymentClicked: root.paymentClicked(address, paymentId, amount, 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 { }
@@ -63,7 +64,7 @@ Rectangle {
     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 sweepUnmixableClicked()
@@ -71,12 +72,25 @@ Rectangle {
     signal getProofClicked(string txid, string address, string message);
     signal checkProofClicked(string txid, string address, string message, string signature);
 
-    Image {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        source: "../images/middlePanelBg.jpg"
+    Rectangle {
+        // grey background on merchantView
+        visible: currentView === merchantView
+        color: MoneroComponents.Style.moneroGrey
+        anchors.fill: parent
+    }
+
+    MoneroEffects.GradientBackground {
+        visible: currentView !== merchantView
+        anchors.fill: parent
+        fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor
+        initialStartColor: MoneroComponents.Style.middlePanelBackgroundGradientStart
+        initialStopColor: MoneroComponents.Style.middlePanelBackgroundGradientStop
+        blackColorStart: MoneroComponents.Style._b_middlePanelBackgroundGradientStart
+        blackColorStop: MoneroComponents.Style._b_middlePanelBackgroundGradientStop
+        whiteColorStart: MoneroComponents.Style._w_middlePanelBackgroundGradientStart
+        whiteColorStop: MoneroComponents.Style._w_middlePanelBackgroundGradientStop
+        start: Qt.point(0, 0)
+        end: Qt.point(height, width)
     }
 
     onCurrentViewChanged: {
@@ -107,72 +121,67 @@ Rectangle {
 
         states: [
             State {
-                name: "Dashboard"
-                PropertyChanges {  }
-            }, State {
                 name: "History"
                 PropertyChanges { target: root; currentView: historyView }
-                PropertyChanges { target: historyView; model: appWindow.currentWallet ? appWindow.currentWallet.historyModel : null }
-                PropertyChanges { target: mainFlickable; contentHeight: historyView.tableHeight + 220 * scaleRatio }
+                PropertyChanges { target: mainFlickable; contentHeight: historyView.contentHeight + 80}
             }, State {
                 name: "Transfer"
                 PropertyChanges { target: root; currentView: transferView }
-                PropertyChanges { target: mainFlickable; contentHeight: 1000 * scaleRatio }
+                PropertyChanges { target: mainFlickable; contentHeight: transferView.transferHeight1 + transferView.transferHeight2 + 80 }
             }, State {
-               name: "Receive"
-               PropertyChanges { target: root; currentView: receiveView }
-               PropertyChanges { target: mainFlickable; contentHeight: receiveView.receiveHeight + 100 }
+                name: "Receive"
+                PropertyChanges { target: root; currentView: receiveView }
+                PropertyChanges { target: mainFlickable; contentHeight: receiveView.receiveHeight + 80 }
             }, State {
-               name: "TxKey"
-               PropertyChanges { target: root; currentView: txkeyView }
-               PropertyChanges { target: mainFlickable; contentHeight: 1200 * scaleRatio  }
+                name: "Merchant"
+                PropertyChanges { target: root; currentView: merchantView }
+                PropertyChanges { target: mainFlickable; contentHeight: merchantView.merchantHeight + 80 }
             }, State {
-               name: "SharedRingDB"
-               PropertyChanges { target: root; currentView: sharedringdbView }
-               PropertyChanges { target: mainFlickable; contentHeight: sharedringdbView.panelHeight + 100  }
+                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: minHeight }
+                PropertyChanges { target: root; currentView: addressBookView }
+                PropertyChanges { target: mainFlickable; contentHeight: addressBookView.addressbookHeight + 80 }
             }, State {
                 name: "Sign"
-               PropertyChanges { target: root; currentView: signView }
-               PropertyChanges { target: mainFlickable; contentHeight: 1200 * scaleRatio  }
+                PropertyChanges { target: root; currentView: signView }
+                PropertyChanges { target: mainFlickable; contentHeight: signView.signHeight + 80 }
             }, State {
                 name: "Settings"
-               PropertyChanges { target: root; currentView: settingsView }
-               PropertyChanges { target: mainFlickable; contentHeight: settingsView.settingsHeight + 100 }
+                PropertyChanges { target: root; currentView: settingsView }
+                PropertyChanges { target: mainFlickable; contentHeight: settingsView.settingsHeight }
             }, State {
                 name: "Mining"
                 PropertyChanges { target: root; currentView: miningView }
-                PropertyChanges { target: mainFlickable; contentHeight: minHeight  }
+                PropertyChanges { target: mainFlickable; contentHeight: miningView.miningHeight + 80 }
             }, State {
                 name: "Keys"
                 PropertyChanges { target: root; currentView: keysView }
-                PropertyChanges { target: mainFlickable; contentHeight: minHeight  + 200 * scaleRatio }
-            }
+                PropertyChanges { target: mainFlickable; contentHeight: keysView.keysHeight + 80}
+            }, State {
+                name: "Account"
+                PropertyChanges { target: root; currentView: accountView }
+                PropertyChanges { target: mainFlickable; contentHeight: accountView.accountHeight + 80 }
+            }	
         ]
 
-    // color stripe at the top
-    Row {
-        id: styledRow
-        height: 4
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-
-        Rectangle { height: 4; width: parent.width / 5; color: "#FFE00A" }
-        Rectangle { height: 4; width: parent.width / 5; color: "#6B0072" }
-        Rectangle { height: 4; width: parent.width / 5; color: "#FF6C3C" }
-        Rectangle { height: 4; width: parent.width / 5; color: "#FFD781" }
-        Rectangle { height: 4; width: parent.width / 5; color: "#FF4F41" }
-    }
-
     ColumnLayout {
         anchors.fill: parent
-        anchors.margins: 18
+        anchors.margins: {
+            if(currentView === merchantView || currentView === historyView)
+                return 0;
+
+            return 20;
+        }
+
         anchors.topMargin: appWindow.persistentSettings.customDecorations ? 50 : 0
+        anchors.bottomMargin: 0
         spacing: 0
 
         Flickable {
@@ -180,15 +189,23 @@ Rectangle {
             Layout.fillWidth: true
             Layout.fillHeight: true
             clip: true
+            boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+
+            ScrollBar.vertical: ScrollBar {
+                parent: root
+                anchors.left: parent.right
+                anchors.leftMargin: -14 // 10 margin + 4 scrollbar width
+                anchors.top: parent.top
+                anchors.topMargin: persistentSettings.customDecorations ? 60 : 10
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10
+                onActiveChanged: if (!active && !isMac) active = true
+            }
 
             onFlickingChanged: {
                 releaseFocus();
             }
 
-            // Disabled scrollbars, gives crash on startup on windows
-//            ScrollIndicator.vertical: ScrollIndicator { }
-//            ScrollBar.vertical: ScrollBar { }       // uncomment to test
-
             // Views container
             StackView {
                 id: stackView
@@ -223,24 +240,27 @@ Rectangle {
 
     // border
     Rectangle {
-        anchors.top: styledRow.bottom
+        id: borderLeft
+        visible: middlePanel.state !== "Merchant"
+        anchors.top: parent.top
         anchors.bottom: parent.bottom
         anchors.left: parent.left
         width: 1
-        color: "#313131"
+        color: MoneroComponents.Style.appWindowBorderColor
+
+        MoneroEffects.ColorTransition {
+            targetObj: parent
+            blackColor: MoneroComponents.Style._b_appWindowBorderColor
+            whiteColor: MoneroComponents.Style._w_appWindowBorderColor
+        }
     }
 
-    /* connect "payment" click */
-    Connections {
-        ignoreUnknownSignals: false
-        target: transferView
-        onPaymentClicked : {
-            console.log("MiddlePanel: paymentClicked")
-            paymentClicked(address, paymentId, amount, mixinCount, priority, description)
-        }
-        onSweepUnmixableClicked : {
-            console.log("MiddlePanel: sweepUnmixableClicked")
-            sweepUnmixableClicked()
-        }
+    // border shadow
+    Image {
+        source: "qrc:///images/middlePanelShadow.png"
+        width: 12
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        anchors.left: borderLeft.right
     }
 }

README.md

@@ -1,14 +1,15 @@
 # Monero GUI
 
-Copyright (c) 2014-2018, The Monero Project
+Copyright (c) 2014-2019, The Monero Project
 
 ## Development resources
 
 - Web: [getmonero.org](https://getmonero.org)
-- Forum: [forum.getmonero.org](https://forum.getmonero.org)
 - Mail: [dev@getmonero.org](mailto:dev@getmonero.org)
 - Github: [https://github.com/monero-project/monero-gui](https://github.com/monero-project/monero-gui)
 - IRC: [#monero-dev on Freenode](irc://chat.freenode.net/#monero-dev)
+- Translation platform (Weblate): [translate.getmonero.org](https://translate.getmonero.org)
+- UI Design: [Monero-GUI on Figma](https://www.figma.com/file/DplJ2DDQfIKiuRvolHX2hN/Monero-GUI)
 
 ## Vulnerability response
 
@@ -35,19 +36,17 @@ As with many development projects, the repository on Github is considered to be
 
 Monero is a 100% community-sponsored endeavor. If you want to join our efforts, the easiest thing you can do is support the project financially. Both Monero and Bitcoin donations can be made to **donate.getmonero.org** if using a client that supports the [OpenAlias](https://openalias.org) standard.
 
-The Monero donation address is: `44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A` (viewkey: `f359631075708155cc3d92a32b75a7d02a5dcf27756707b47a2b31b21c389501`)
+The Monero donation address is: `888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H` (viewkey: `f359631075708155cc3d92a32b75a7d02a5dcf27756707b47a2b31b21c389501`)
 
 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).
 
@@ -55,18 +54,125 @@ There are also several mining pools that kindly donate a portion of their fees,
 
 See [LICENSE](LICENSE).
 
+## Translations
+
+Do you speak a second language and would like to help translate the Monero GUI? Check out Weblate, our localization platform, at [translate.getmonero.org](https://translate.getmonero.org/). Choose the language and suggest a translation for a string or review an existing one. The Localization Workgroup made [a guide with step-by-step instructions](https://github.com/monero-ecosystem/monero-translations/blob/master/weblate.md) for Weblate.
+
+If you need help/support or any info you can contact the localization workgroup on the IRC channel #monero-translations (relayed on matrix/riot and MatterMost) or by email at translate[at]getmonero[dot]org. For more info about the Localization workgroup: [github.com/monero-ecosystem/monero-translations](https://github.com/monero-ecosystem/monero-translations)
+
+Status of the translations:  
+<a href="https://translate.getmonero.org/engage/monero/?utm_source=widget">
+<img src="https://translate.getmonero.org/widgets/monero/-/gui-wallet/horizontal-auto.svg" alt="Translation status" />
+</a>
+
 ## Installing the Monero GUI from a package
 
 Packages are available for
-
-* Arch Linux via AUR: [monero-wallet-qt](https://aur.archlinux.org/packages/monero-wallet-qt/)
-* 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 cask install monero-wallet`
 
 Packaging for your favorite distribution would be a welcome contribution!
 
 ## Compiling the Monero GUI from source
 
+*Note*: Qt 5.9.7 is the minimum version required to build the GUI.
+
+### Building Windows static binaries with Docker (any OS)
+
+1. Install Docker [https://docs.docker.com/engine/install/](https://docs.docker.com/engine/install/)
+2. Clone the repository
+   ```
+   git clone --recursive https://github.com/monero-project/monero-gui.git
+   ```
+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 Linux static binaries with Docker (any OS)
+
+1. Install Docker [https://docs.docker.com/engine/install/](https://docs.docker.com/engine/install/)
+2. Clone the repository
+   ```
+   git clone --recursive https://github.com/monero-project/monero-gui.git
+   ```
+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
+
+### Building Android APK with Docker (any OS) *Experimental*
+ - Minimum Android 9 Pie (API 28)
+ - ARMv8-A 64-bit CPU
+1. Install Docker [https://docs.docker.com/engine/install/](https://docs.docker.com/engine/install/)
+2. Clone the repository
+   ```
+   git clone --recursive https://github.com/monero-project/monero-gui.git
+   ```
+3. Prepare build environment
+   ```
+   cd monero-gui
+   docker build --tag monero:build-env-android --build-arg THREADS=4 --file Dockerfile.android .
+   ```
+   \* `4` - number of CPU threads to use
+
+4. Build
+   ```
+   docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -e THREADS=4 monero:build-env-android
+   ```
+   \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory  
+   \* `4` - number of CPU threads to use
+5. Monero GUI APK will be placed in  `monero-gui/build/Android/release/android-build` directory
+6. Deploy
+   * Using ADB (Android debugger bridge)
+     - [Enable adb debugging on your device](https://developer.android.com/studio/command-line/adb.html#Enabling)
+      * Connect your device with USB and install Monero GUI APK with adb:
+      ```
+      adb install build/Android/release/android-build/monero-gui.apk
+      ```
+      * Troubleshooting:
+      ```
+      adb devices -l
+      adb logcat
+      ```
+      * If using adb inside docker, make sure you did
+      ```
+      docker run -v /dev/bus/usb:/dev/bus/usb --privileged
+      ```
+   * Using a web server
+      ```
+      mkdir /usr/tmp
+      cp build/Android/release/android-build/monero-gui.apk /usr/tmp
+      docker run -d -v /usr/tmp:/usr/share/nginx/html:ro -p 8080:80 nginx
+      ```
+      Now it should be accessible through a web browser at
+      ```
+      http://<your.local.ip>:8080/QtApp-debug.apk
+      ```
+
 ### On Linux:
 
 (Tested on Ubuntu 17.10 x64, Ubuntu 18.04 x64 and Gentoo x64)
@@ -75,19 +181,27 @@ Packaging for your favorite distribution would be a welcome contribution!
 
   - For Debian distributions (Debian, Ubuntu, Mint, Tails...)
 
-	`sudo apt install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev`
+	`sudo apt install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev libprotobuf-dev protobuf-compiler libgcrypt20-dev`
 
   - For Gentoo
 
-	`sudo emerge app-arch/xz-utils app-doc/doxygen dev-cpp/gtest dev-libs/boost dev-libs/expat dev-libs/openssl dev-util/cmake media-gfx/graphviz net-dns/unbound net-libs/ldns net-libs/miniupnpc net-libs/zeromq sys-libs/libunwind`
+	`sudo emerge app-arch/xz-utils app-doc/doxygen dev-cpp/gtest dev-libs/boost dev-libs/expat dev-libs/openssl dev-util/cmake media-gfx/graphviz net-dns/unbound net-libs/ldns net-libs/miniupnpc net-libs/zeromq sys-libs/libunwind dev-libs/libsodium dev-libs/hidapi dev-libs/libgcrypt`
+
+  - For Fedora
+
+	`sudo dnf install make automake cmake gcc-c++ boost-devel miniupnpc-devel graphviz doxygen unbound-devel libunwind-devel pkgconfig openssl-devel libcurl-devel hidapi-devel libusb-devel zeromq-devel libgcrypt-devel`
 
 2. Install Qt:
 
-  *Note*: Qt 5.7 is the minimum version required to build the GUI. This makes **some** distributions (mostly based on debian, like Ubuntu 16.x or Linux Mint 18.x) obsolete. You can still build the GUI if you install an [official Qt release](https://wiki.qt.io/Install_Qt_5_on_Ubuntu), but this is not officially supported.
+  *Note*: The Qt 5.9.7 or newer requirement makes **some** distributions (mostly based on debian, like Ubuntu 16.x or Linux Mint 18.x) obsolete due to their repositories containing an older Qt version.
+
+ The recommended way is to install 5.9.7 from the [official Qt installer](https://www.qt.io/download-qt-installer) or [compiling it yourself](https://wiki.qt.io/Install_Qt_5_on_Ubuntu). This ensures you have the correct version. Higher versions *can* work but as it differs from our production build target, slight differences may occur.
+
+The following instructions will fetch Qt from your distribution's repositories instead. Take note of what version it installs. Your mileage may vary.
 
   - 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`
+    `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`
 
   - For Gentoo
 
@@ -108,14 +222,18 @@ Packaging for your favorite distribution would be a welcome contribution!
 
 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
-    ./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.
 
@@ -127,58 +245,30 @@ The executable can be found in the build/release/bin folder.
 
 3. Install [monero](https://github.com/monero-project/monero) dependencies:
 
-  `brew install boost --c++11`
-
-  `brew install openssl` - to install openssl headers
-
-  `brew install pkgconfig`
-
-  `brew install cmake`
-
-  `brew install zeromq`
-
-  *Note*: If cmake can not find zmq.hpp file on OS X, installing `zmq.hpp` from https://github.com/zeromq/cppzmq to `/usr/local/include` should fix that error.
+  `brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf libgcrypt`
 
 4. Install Qt:
 
-  `brew install qt5`  (or download QT 5.8+ from [qt.io](https://www.qt.io/download-open-source/))
+  `brew install qt5`  (or download QT 5.9.7+ from [qt.io](https://www.qt.io/download-open-source/))
 
-  If you have an older version of Qt installed via homebrew, you can force it to use 5.x like so:
-  
-  `brew link --force --overwrite qt5`
+5. Grab an up-to-date copy of the monero-gui repository
 
-5. Add the Qt bin directory to your path
+   ```
+   git clone --recursive https://github.com/monero-project/monero-gui.git
+   cd monero-gui
+   ```
 
-    Example: `export PATH=$PATH:$HOME/Qt/5.8/clang_64/bin`
+6. Start the build
 
-    This is the directory where Qt 5.x is installed on **your** system
-
-6. Grab an up-to-date copy of the monero-gui repository
-
-  `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.
 
-**Note:** Workaround for "ERROR: Xcode not set up properly"
-
-Edit `$HOME/Qt/5.8/clang_64/mkspecs/features/mac/default_pre.prf`
-
-replace
-`isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null")))`
-
-with
-`isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null")))`
-
-More info: http://stackoverflow.com/a/35098040/1683164
-
+For building an application bundle see `DEPLOY.md`.
 
 ### On Windows:
 
@@ -191,9 +281,15 @@ The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not off
 3. Install MSYS2 packages for Monero dependencies; the needed 64-bit packages have `x86_64` in their names
 
     ```
-    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
+    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
@@ -213,16 +309,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
-    ./build.sh
-    cd build
+    make release-win64 -j4
+    cd build/release
     make deploy
     ```
+    \* `4` - number of CPU threads to use
 
-The executable can be found in the `.\release\bin` directory.
+The executable can be found in the `.\bin` directory.

TranslationManager.h

@@ -1,29 +0,0 @@
-#ifndef TRANSLATIONMANAGER_H
-#define TRANSLATIONMANAGER_H
-
-#include <QObject>
-
-class QTranslator;
-class TranslationManager : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString emptyString READ emptyString  NOTIFY languageChanged)
-public:
-    Q_INVOKABLE bool setLanguage(const QString &language);
-    static TranslationManager *instance();
-
-    QString emptyString();
-
-signals:
-    void languageChanged();
-
-private:
-    explicit TranslationManager(QObject *parent = 0);
-
-private:
-    static TranslationManager * m_instance;
-    QTranslator * m_translator;
-
-};
-
-#endif // TRANSLATIONMANAGER_H

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,122 +0,0 @@
-#!/bin/bash
-
-BUILD_TYPE=$1
-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
-./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
-echo "var GUI_VERSION = \"$TAGNAME\"" > version.js
-pushd "$MONERO_DIR"
-get_tag
-popd
-echo "var GUI_MONERO_VERSION = \"$TAGNAME\"" >> 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/32-bit-toolchain.cmake

@@ -0,0 +1,50 @@
+# 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.
+
+if (NOT CMAKE_HOST_WIN32)
+  set (CMAKE_SYSTEM_NAME Windows)
+endif()
+
+set (GCC_PREFIX i686-w64-mingw32)
+set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc)
+set (CMAKE_CXX_COMPILER ${GCC_PREFIX}-g++)
+set (CMAKE_AR ar CACHE FILEPATH "" FORCE)
+set (CMAKE_NM nm CACHE FILEPATH "" FORCE)
+set (CMAKE_LINKER ld CACHE FILEPATH "" FORCE)
+#set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
+set (CMAKE_RC_COMPILER windres)
+
+set (CMAKE_FIND_ROOT_PATH "${MSYS2_FOLDER}/mingw32")
+
+# Ensure cmake doesn't find things in the wrong places
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) # Find libs in target
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # Find includes in target
+
+set (MINGW_FLAG "-m32")
+set (USE_LTO_DEFAULT false)

cmake/64-bit-toolchain.cmake

@@ -0,0 +1,50 @@
+# 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.
+
+if (NOT CMAKE_HOST_WIN32)
+  set (CMAKE_SYSTEM_NAME Windows)
+endif()
+
+set (GCC_PREFIX x86_64-w64-mingw32)
+set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc)
+set (CMAKE_CXX_COMPILER ${GCC_PREFIX}-g++)
+set (CMAKE_AR ar CACHE FILEPATH "" FORCE)
+set (CMAKE_NM nm CACHE FILEPATH "" FORCE)
+set (CMAKE_LINKER ld CACHE FILEPATH "" FORCE)
+#set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
+set (CMAKE_RC_COMPILER windres)
+
+set (CMAKE_FIND_ROOT_PATH "${MSYS2_FOLDER}/mingw64")
+
+# Ensure cmake doesn't find things in the wrong places
+set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host
+set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) # Find libs in target
+set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # Find includes in target
+
+set (MINGW_FLAG "-m64")
+set (USE_LTO_DEFAULT false)

cmake/CheckLinkerFlag.c

@@ -0,0 +1,14 @@
+#ifdef __CLASSIC_C__
+int main()
+{
+  int ac;
+  char* av[];
+#else
+int main(int ac, char* av[])
+{
+#endif
+  if (ac > 1000) {
+    return *av[0];
+  }
+  return 0;
+}

cmake/CheckLinkerFlag.cmake

@@ -0,0 +1,47 @@
+include(CheckCCompilerFlag)
+
+macro(CHECK_LINKER_FLAG flag VARIABLE)
+  if(NOT DEFINED "${VARIABLE}")
+    if(NOT CMAKE_REQUIRED_QUIET)
+      message(STATUS "Looking for ${flag} linker flag")
+    endif()
+
+    set(_cle_source ${CMAKE_SOURCE_DIR}/cmake/CheckLinkerFlag.c)
+
+    set(saved_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
+    set(CMAKE_C_FLAGS "${flag}")
+    try_compile(${VARIABLE}
+      ${CMAKE_BINARY_DIR}
+      ${_cle_source}
+      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${flag}
+      CMAKE_FLAGS
+      OUTPUT_VARIABLE OUTPUT)
+    unset(_cle_source)
+    set(CMAKE_C_FLAGS ${saved_CMAKE_C_FLAGS})
+    unset(saved_CMAKE_C_FLAGS)
+
+    if ("${OUTPUT}" MATCHES "warning.*ignored")
+      set(${VARIABLE} 0)
+    endif()
+
+    if(${VARIABLE})
+      if(NOT CMAKE_REQUIRED_QUIET)
+        message(STATUS "Looking for ${flag} linker flag - found")
+      endif()
+      set(${VARIABLE} 1 CACHE INTERNAL "Have linker flag ${flag}")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+        "Determining if the ${flag} linker flag is supported "
+        "passed with the following output:\n"
+        "${OUTPUT}\n\n")
+    else()
+      if(NOT CMAKE_REQUIRED_QUIET)
+        message(STATUS "Looking for ${flag} linker flag - not found")
+      endif()
+      set(${VARIABLE} "" CACHE INTERNAL "Have linker flag ${flag}")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+        "Determining if the ${flag} linker flag is supported "
+        "failed with the following output:\n"
+        "${OUTPUT}\n\n")
+    endif()
+  endif()
+endmacro()

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

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

cmake/FindHIDAPI.cmake

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

cmake/FindLibUSB.cmake

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

cmake/FindZBar0.cmake

@@ -0,0 +1,38 @@
+# 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)
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_ZBAR QUIET zbar)
+  if(PC_ZBAR_FOUND)
+    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)
+  endif()
+endif()
+
+if(NOT ZBAR_LIBRARIES AND ANDROID)
+  find_library(ZBARJNI_LIBRARY NAMES zbarjni)
+  find_library(ICONV_LIBRARY NAMES iconv)
+  if(ZBARJNI_LIBRARY AND ICONV_LIBRARY)
+    set(ZBAR_LIBRARIES ${ZBARJNI_LIBRARY} ${ICONV_LIBRARY})
+  endif()
+endif()
+
+if(NOT ZBAR_INCLUDE_DIR)
+  find_path(ZBAR_H_PATH zbar.h)
+  if(ZBAR_H_PATH)
+    set(ZBAR_INCLUDE_DIR "${ZBAR_H_PATH}/zbar")
+  endif()
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ZBAR  DEFAULT_MSG  ZBAR_LIBRARIES ZBAR_INCLUDE_DIR)
+message(STATUS "Found zbar libraries ${ZBAR_LIBRARIES}")

cmake/GitGetVersionTag.cmake

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

cmake/VersionGui.cmake

@@ -0,0 +1,49 @@
+# 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.
+
+function (write_static_version_header VERSION_TAG_GUI)
+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/version.js.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.js")
+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)
+  message(STATUS "Found Git: ${GIT_EXECUTABLE}")
+
+  include(GitGetVersionTag)
+  git_get_version_tag(${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} VERSION_TAG_GUI)
+  STRING(REGEX REPLACE "^v([0-9])" "\\1" VERSION_TAG_GUI ${VERSION_TAG_GUI})
+  write_static_version_header(${VERSION_TAG_GUI})
+else()
+  message(STATUS "WARNING: Git was not found!")
+  write_static_version_header("unknown")
+endif ()
+add_custom_target(genversiongui ALL
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/version.js")

cmake/test-libusb-version.c

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -26,47 +26,27 @@
 // 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.0
+#include <libusb.h>
 
-import "../components" as MoneroComponents
+#define UNUSED(expr) (void)(expr)
 
-Item {
-    id: delegateItem
-    width: 1
-    height: 48
-    property bool mainTick: false
-    property int currentIndex
-    property int currentX
+int main(int argc, char *argv[]) {
+  libusb_device **devs;
+  libusb_context *ctx = NULL;
 
-    Image {
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: parent.top
-        visible: parent.mainTick
-        source: "../images/privacyTick.png"
+  int r = libusb_init(&ctx); UNUSED(r);
+  ssize_t cnt = libusb_get_device_list(ctx, &devs); UNUSED(cnt);
 
-        Text {
-            anchors.right: parent.right
-            anchors.rightMargin: 12
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 2
-            font.family: "Arial"
-            font.bold: true
-            font.pixelSize: 12 * scaleRatio
-            color: MoneroComponents.Style.defaultFontColor
-            text: {
-                if(currentIndex === 0) return qsTr("Default") + translationManager.emptyString
-                if(currentIndex === 13) return qsTr("High") + translationManager.emptyString
-                return ""
-            }
-        }
-    }
+  struct libusb_device_descriptor desc;
+  r = libusb_get_device_descriptor(devs[0], &desc); UNUSED(r);
+  uint8_t bus_id = libusb_get_bus_number(devs[0]); UNUSED(bus_id);
+  uint8_t addr = libusb_get_device_address(devs[0]); UNUSED(addr);
 
-    Rectangle {
-        anchors.top: parent.top
-        anchors.topMargin: 14
-        width: 1
-        color: "#DBDBDB"
-        height:  8
-        visible: !parent.mainTick
-    }
+  uint8_t tmp_path[16];
+  r = libusb_get_port_numbers(devs[0], tmp_path, sizeof(tmp_path));
+  UNUSED(r);
+  UNUSED(tmp_path);
+
+  libusb_free_device_list(devs, 1);
+  libusb_exit(ctx);
 }

components/AddressBookTable.qml

@@ -1,171 +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.0
-import moneroComponents.Clipboard 1.0
-
-ListView {
-    id: listView
-    clip: true
-    boundsBehavior: ListView.StopAtBounds
-
-    footer: Rectangle {
-        height: 127
-        width: listView.width
-        color: "transparent"
-
-        Text {
-            anchors.centerIn: parent
-            font.family: "Arial"
-            font.pixelSize: 14
-            color: "#808080"
-            text: qsTr("No more results") + translationManager.emptyString
-        }
-    }
-
-    property var previousItem
-    delegate: Rectangle {
-        id: delegate
-        height: 64
-        width: listView.width
-        color: "transparent"
-        z: listView.count - index
-        function collapseDropdown() { dropdown.expanded = false }
-
-        Text {
-            id: descriptionText
-            anchors.left: parent.left
-            anchors.top: parent.top
-            anchors.topMargin: 12
-            width: text.length ? (descriptionArea.containsMouse ? 139 : 139) : 0
-            font.family: "Arial"
-            font.bold: true
-            font.pixelSize: 19
-            color: "#ffffff"
-            elide: Text.ElideRight
-            text: description
-
-            MouseArea {
-                id: descriptionArea
-                anchors.fill: parent
-                hoverEnabled: true
-            }
-        }
-
-        TextEdit {
-            id: addressText
-            selectByMouse: true
-            anchors.bottom: descriptionText.bottom
-            anchors.left: descriptionText.right
-            anchors.right: dropdown.left
-            anchors.leftMargin: description.length > 0 ? 12 : 0
-            anchors.rightMargin: 40
-            font.family: "Arial"
-            font.pixelSize: 16
-            color: "#ffffff"
-            text: address
-            readOnly: true
-        }
-
-        Text {
-            id: paymentLabel
-            anchors.left: parent.left
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 12
-
-            width: 139
-            font.family: "Arial"
-            font.pixelSize: 12
-            color: "#ffffff"
-            text: qsTr("Payment ID:") + translationManager.emptyString
-        }
-
-        TextEdit {
-            selectByMouse: true;
-            anchors.bottom: paymentLabel.bottom
-            anchors.left: paymentLabel.right
-            anchors.leftMargin: 12
-            anchors.rightMargin: 12
-            anchors.right: dropdown.left
-            readOnly: true
-
-            font.family: "Arial"
-            font.pixelSize: 13
-            color: "#545454"
-            text: paymentId
-        }
-
-        ListModel {
-            id: dropModel
-            ListElement { name: "<b>Copy address to clipboard</b>"; icon: "../images/dropdownCopy.png" }
-            ListElement { name: "<b>Send to this address</b>"; icon: "../images/dropdownSend.png" }
-//            ListElement { name: "<b>Find similar transactions</b>"; icon: "../images/dropdownSearch.png" }
-            ListElement { name: "<b>Remove from address book</b>"; icon: "../images/dropdownDel.png" }
-        }
-
-        Clipboard { id: clipboard }
-        TableDropdown {
-            id: dropdown
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.rightMargin: 5
-            dataModel: dropModel
-            z: 1
-            onExpandedChanged: {
-                if(expanded) {
-                    listView.previousItem = delegate
-                    listView.currentIndex = index
-                }
-            }
-            onOptionClicked: {
-                // Ensure tooltip is closed
-                appWindow.toolTip.visible = false;
-                if(option === 0) {
-                    clipboard.setText(address)
-                    appWindow.showStatusMessage(qsTr("Address copied to clipboard"),3)
-                }
-                else if(option === 1){
-                   console.log("Sending to: ", address +" "+ paymentId);
-                   middlePanel.sendTo(address, paymentId, description);
-                   leftPanel.selectItem(middlePanel.state)
-                } else if(option === 2){
-                    console.log("Delete: ", rowId);
-                    currentWallet.addressBookModel.deleteRow(rowId);
-                }
-            }
-        }
-
-        Rectangle {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            height: 1
-            color: "#404040"
-        }
-    }
-}

components/AdvancedOptionsItem.qml

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

components/CMakeLists.txt

@@ -0,0 +1,47 @@
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+###
+
+#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defines.h.cmake
+#               ${CMAKE_CURRENT_BINARY_DIR}/defines.h)
+
+file(GLOB_RECURSE UI_FILES *.ui)
+file(GLOB_RECURSE CODE_FILES *.cpp)
+
+qt5_wrap_ui(UI_HEADERS ${UI_FILES})
+#qt5_add_resources(RESOURCE_FILES ../resources/resources.qrc)
+
+# Windows application icon
+if (WIN32)
+  set(WINDOWS_RES_FILE ${CMAKE_CURRENT_BINARY_DIR}/resources.obj)
+  if (MSVC)
+    add_custom_command(OUTPUT ${WINDOWS_RES_FILE}
+      COMMAND rc.exe /fo ${WINDOWS_RES_FILE} resources.rc
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/win
+    )
+  else()
+    add_custom_command(OUTPUT ${WINDOWS_RES_FILE}
+      COMMAND windres.exe resources.rc ${WINDOWS_RES_FILE}
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/win
+    )
+  endif()
+endif()
+
+add_executable(${CMAKE_PROJECT_NAME} WIN32
+  ${UI_HEADERS}
+  ${CODE_FILES}
+  ${RESOURCE_FILES}
+  ${WINDOWS_RES_FILE}
+)
+target_link_libraries(${CMAKE_PROJECT_NAME}
+  Qt5::Widgets
+)
+
+if (UNIX)
+  install(TARGETS ${CMAKE_PROJECT_NAME}
+          RUNTIME DESTINATION bin)
+elseif (WIN32)
+  install(TARGETS ${CMAKE_PROJECT_NAME}
+          DESTINATION .)
+endif()

components/CheckBox.qml

@@ -26,84 +26,98 @@
 // 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.0
+import QtQuick 2.9
 import QtQuick.Layouts 1.1
+import FontAwesome 1.0
 
-import "../components" as MoneroComponents
+import "." as MoneroComponents
+import "effects/" as MoneroEffects
 
-RowLayout {
+Item {
     id: checkBox
     property alias text: label.text
-    property string checkedIcon: "../images/checkedIcon-black.png"
+    property string checkedIcon: "qrc:///images/check-white.svg"
     property string uncheckedIcon
+    property bool fontAwesomeIcons: false
+    property int imgWidth: 13
+    property int imgHeight: 13
+    property bool toggleOnClick: true
     property bool checked: false
     property alias background: backgroundRect.color
-    property int fontSize: 14 * scaleRatio
+    property bool border: true
+    property int fontSize: 14
     property alias fontColor: label.color
+    property bool iconOnTheLeft: true
     signal clicked()
-    height: 25 * scaleRatio
+    height: 25
+    width: checkBoxLayout.width
 
     function toggle(){
-        checkBox.checked = !checkBox.checked
+        if (checkBox.toggleOnClick) {
+            checkBox.checked = !checkBox.checked
+        }
         checkBox.clicked()
     }
 
     RowLayout {
-        Layout.fillWidth: true
-        Rectangle {
-            anchors.left: parent.left
-            width: 25 * scaleRatio
-            height: checkBox.height - 1
-            radius: 3
-            y: 0
-            color: "transparent"
-            border.color:
-                if(checkBox.checked){
-                    return MoneroComponents.Style.inputBorderColorActive;
-                } else {
-                    return MoneroComponents.Style.inputBorderColorInActive;
-                }
-        }
+        id: checkBoxLayout
+        layoutDirection: iconOnTheLeft ? Qt.LeftToRight : Qt.RightToLeft
+        spacing: 10
 
-        Rectangle {
-            id: backgroundRect
-            anchors.left: parent.left
-            width: 25 * scaleRatio
-            height: checkBox.height - 1
-            y: 1
-            color: "transparent"
+        Item {
+            id: checkMark
+            height: checkBox.height
+            width: checkBox.height
 
-            Image {
-                anchors.centerIn: parent
-                source: checkBox.checkedIcon
-                visible: checkBox.checked
-            }
-
-            MouseArea {
+            Rectangle {
+                id: backgroundRect
+                visible: checkBox.border
                 anchors.fill: parent
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    toggle()
+                radius: 3
+                color: checkBox.enabled ? "transparent" : MoneroComponents.Style.inputBoxBackgroundDisabled
+                border.color:
+                    if(checkBox.checked){
+                        return MoneroComponents.Style.inputBorderColorActive;
+                    } else {
+                        return MoneroComponents.Style.inputBorderColorInActive;
+                    }
+            }
+
+            MoneroEffects.ImageMask {
+                id: img
+                visible: checkBox.checked || checkBox.uncheckedIcon != ""
+                anchors.centerIn: parent
+                width: checkBox.imgWidth
+                height: checkBox.imgHeight
+                color: MoneroComponents.Style.defaultFontColor
+                fontAwesomeFallbackIcon: checkBox.fontAwesomeIcons ? getIcon() : FontAwesome.plus
+                fontAwesomeFallbackSize: 14
+                image: checkBox.fontAwesomeIcons ? "" : getIcon()
+
+                function getIcon() {
+                    if (checkBox.checked || checkBox.uncheckedIcon == "")
+                        return checkBox.checkedIcon;
+                    return checkBox.uncheckedIcon;
                 }
             }
         }
 
-        Text {
+        MoneroComponents.TextPlain {
             id: label
             font.family: MoneroComponents.Style.fontRegular.name
             font.pixelSize: checkBox.fontSize
             color: MoneroComponents.Style.defaultFontColor
-            wrapMode: Text.Wrap
-            Layout.fillWidth: true
-            anchors.left: backgroundRect.right
-            anchors.leftMargin: !isMobile ? 10 : 8
-            MouseArea {
-                anchors.fill: parent
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    toggle()
-                }
-            }
+            textFormat: Text.RichText
+            wrapMode: Text.NoWrap
+            visible: text != ""
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        onClicked: {
+            toggle()
         }
     }
 }

components/CheckBox2.qml

@@ -26,22 +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.
 
-import QtQuick 2.0
+import QtQuick 2.9
 import QtQuick.Layouts 1.1
+import QtGraphicalEffects 1.0
+import FontAwesome 1.0
+
 import "." 1.0
+import "." as MoneroComponents
+import "effects/" as MoneroEffects
 
 RowLayout {
     id: checkBox
     property alias text: label.text
-    property string checkedIcon: "../images/checkedIcon-black.png"
-    property string uncheckedIcon
     property bool checked: false
-    property string background: "backgroundRect.color"
-    property int fontSize: 14 * scaleRatio
+    property int fontSize: 14
     property alias fontColor: label.color
-    property int textMargin: 8 * scaleRatio
+    property int textMargin: 8
     signal clicked()
-    height: 25 * scaleRatio
+    height: 25
 
     function toggle(){
         checkBox.checked = !checkBox.checked
@@ -55,9 +57,8 @@ RowLayout {
             height: label.height
             width: (label.width + indicatorRect.width + checkBox.textMargin)
             color: "transparent"
-            anchors.left: parent.left
 
-            Text {
+            MoneroComponents.TextPlain {
                 id: label
                 font.family: Style.fontLight.name
                 font.pixelSize: checkBox.fontSize
@@ -74,16 +75,29 @@ RowLayout {
                 anchors.left: label.right
                 anchors.leftMargin: textMargin
                 color: "transparent"
+                rotation: checkBox.checked ? 180  : 0
 
-                Image {
+                MoneroEffects.ImageMask {
                     id: indicatorImage
                     anchors.centerIn: parent
-                    source: "../images/whiteDropIndicator.png"
-                    rotation: checkBox.checked ? 180  * scaleRatio : 0
+                    width: 12
+                    height: 8
+                    image: "qrc:///images/whiteDropIndicator.png"
+                    color: MoneroComponents.Style.defaultFontColor
+                    opacity: MoneroComponents.Style.blackTheme ? 1 : 0.75
+                    fontAwesomeFallbackIcon: FontAwesome.arrowDown
+                    fontAwesomeFallbackSize: 14
+
+                    MoneroEffects.ColorTransition {
+                        targetObj: indicatorImage
+                        blackColor: "white"
+                        whiteColor: "black"
+                        duration: 500
+                    }
                 }
             }
 
-            MouseArea{
+            MouseArea {
                 anchors.fill: parent
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
@@ -92,7 +106,5 @@ RowLayout {
                 }
             }
         }
-
-
     }
 }

components/ContextMenu.qml

@@ -0,0 +1,40 @@
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+
+import FontAwesome 1.0
+import "../components" as MoneroComponents
+
+MouseArea {
+    signal paste()
+
+    id: root
+    acceptedButtons: Qt.RightButton
+    anchors.fill: parent
+    onClicked: {
+        if (mouse.button === Qt.RightButton)
+            contextMenu.open()
+    }
+
+    Menu {
+        id: contextMenu
+
+        background: Rectangle {
+            border.color: MoneroComponents.Style.buttonBackgroundColorDisabledHover
+            border.width: 1
+            radius: 2
+            color: MoneroComponents.Style.buttonBackgroundColorDisabled
+        }
+
+        padding: 1
+        width: 100
+        x: root.mouseX
+        y: root.mouseY
+
+        MoneroComponents.ContextMenuItem {
+            enabled: root.parent.canPaste === true
+            glyphIcon: FontAwesome.paste
+            onTriggered: root.paste()
+            text: qsTr("Paste") + translationManager.emptyString
+        }
+    }
+}

components/ContextMenuItem.qml

@@ -0,0 +1,52 @@
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.1
+
+import FontAwesome 1.0
+import "../components" as MoneroComponents
+
+MenuItem {
+    id: menuItem
+
+    property bool glyphIconSolid: true
+    property alias glyphIcon: glyphIcon.text
+
+    background: Rectangle {
+        color: MoneroComponents.Style.buttonBackgroundColorDisabledHover
+        opacity: mouse.containsMouse ? 1 : 0
+
+        MouseArea {
+            id: mouse
+
+            anchors.fill: parent
+            hoverEnabled: true
+            onClicked: menuItem.triggered()
+            visible: menuItem.enabled
+        }
+    }
+
+    contentItem: RowLayout {
+        anchors.fill: parent
+        anchors.leftMargin: 10
+        anchors.rightMargin: 10
+        opacity: menuItem.enabled ? 1 : 0.4
+        spacing: 8
+
+        Text {
+            id: glyphIcon
+
+            color: MoneroComponents.Style.buttonTextColor
+            font.family: glyphIconSolid ? FontAwesome.fontFamilySolid : FontAwesome.fontFamily
+            font.pixelSize: 14
+            font.styleName: glyphIconSolid ? "Solid" : "Regular"
+        }
+
+        Text {
+            color: MoneroComponents.Style.buttonTextColor
+            font.family: MoneroComponents.Style.fontRegular.name
+            font.pixelSize: 14
+            Layout.fillWidth: true
+            text: menuItem.text
+        }
+    }
+}

components/DaemonConsole.qml

@@ -1,216 +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.0
-import QtQuick.Controls 2.0
-import QtQuick.Dialogs 1.2
-import QtQuick.Layouts 1.1
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Window 2.2
-
-import "../components" as MoneroComponents
-import "../js/Windows.js" as Windows
-import "../js/Utils.js" as Utils
-
-Window {
-    id: root
-    modality: Qt.ApplicationModal
-    color: "black"
-    flags: Windows.flags
-    property alias text: dialogContent.text
-    property alias content: root.text
-    property alias textArea: dialogContent
-    property var icon
-
-    // same signals as Dialog has
-    signal accepted()
-    signal rejected()
-
-    onClosing: {
-        inactiveOverlay.visible = false;
-    }
-
-    function open() {
-        inactiveOverlay.visible = true;
-        show();
-    }
-
-    // TODO: implement without hardcoding sizes
-    width:  480
-    height: 280
-
-    // background gradient
-    Image {
-        anchors.fill: parent
-        source: "../images/middlePanelBg.jpg"
-    }
-
-    // Make window draggable
-    MouseArea {
-        anchors.fill: parent
-        property point lastMousePos: Qt.point(0, 0)
-        onPressed: { lastMousePos = Qt.point(mouseX, mouseY); }
-        onMouseXChanged: root.x += (mouseX - lastMousePos.x)
-        onMouseYChanged: root.y += (mouseY - lastMousePos.y)
-    }
-
-    ColumnLayout {
-        id: mainLayout
-
-        anchors.fill: parent
-        anchors.topMargin: 20 * scaleRatio
-        anchors.margins: 35 * scaleRatio
-        spacing: 20 * scaleRatio
-
-        RowLayout {
-            id: content
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-
-            Flickable {
-                id: flickable
-                anchors.fill: parent
-
-                TextArea.flickable: TextArea {
-                    id : dialogContent
-                    textFormat: TextEdit.RichText
-                    selectByMouse: true
-                    selectByKeyboard: true
-                    anchors.fill: parent
-                    font.family: "Ariel"
-                    font.pixelSize: 14 * scaleRatio
-                    color: MoneroComponents.Style.defaultFontColor
-                    selectionColor: MoneroComponents.Style.dimmedFontColor
-                    wrapMode: TextEdit.Wrap
-                    readOnly: true
-                    background: Rectangle {
-                        color: "transparent"
-                        anchors.fill: parent
-                        border.color: Qt.rgba(255, 255, 255, 0.25);
-                        border.width: 1
-                        radius: 4
-                    }
-                    function logCommand(msg){
-                        msg = log_color(msg, "lime");
-                        textArea.append(msg);
-                    }
-                    function logMessage(msg){
-                        msg = msg.trim();
-                        var color = "white";
-                        if(msg.toLowerCase().indexOf('error') >= 0){
-                            color = "red";
-                        } else if (msg.toLowerCase().indexOf('warning') >= 0){
-                            color = "yellow";
-                        }
-
-                        // format multi-lines
-                        if(msg.split("\n").length >= 2){
-                            msg = msg.split("\n").join('<br>');
-                        }
-
-                        log(msg, color);
-                    }
-                    function log_color(msg, color){
-                        return "<span style='color: " + color +  ";' >" + msg + "</span>";
-                    }
-                    function log(msg, color){
-                        var timestamp = Utils.formatDate(new Date(), {
-                            weekday: undefined,
-                            month: "numeric",
-                            timeZoneName: undefined
-                        });
-
-                        var _timestamp = log_color("[" + timestamp + "]", "#FFFFFF");
-                        var _msg = log_color(msg, color);
-                        textArea.append(_timestamp + " " + _msg);
-
-                        // scroll to bottom
-                        //if(flickable.contentHeight > content.height){
-                        //    flickable.contentY = flickable.contentHeight + 20;
-                        //}
-                    }
-                }
-
-                ScrollBar.vertical: ScrollBar {
-                    // TODO: scrollbar always visible is buggy.
-                    // QT 5.9 introduces `policy: ScrollBar.AlwaysOn`
-                    contentItem.opacity: 1
-                    anchors.top: flickable.top
-                    anchors.left: flickable.right
-                    anchors.leftMargin: 10 * scaleRatio
-                    anchors.bottom: flickable.bottom
-                }
-            }
-        }
-
-        RowLayout {
-            Layout.fillWidth: true
-
-            MoneroComponents.LineEdit {
-                id: sendCommandText
-                Layout.fillWidth: true
-                placeholderText: qsTr("command + enter (e.g help)") + translationManager.emptyString
-                onAccepted: {
-                    if(text.length > 0) {
-                        textArea.logCommand(">>> " + text)
-                        daemonManager.sendCommand(text, currentWallet.nettype);
-                    }
-                    text = ""
-                }
-            }
-        }
-    }
-
-    // window borders
-    Rectangle {
-        anchors.bottom: parent.bottom
-        anchors.top: parent.top
-        anchors.left: parent.left
-        width:1
-        color: "#2F2F2F"
-        z: 2
-    }
-
-    Rectangle {
-        anchors.bottom: parent.bottom
-        anchors.top: parent.top
-        anchors.right: parent.right
-        width:1
-        color: "#2F2F2F"
-        z: 2
-    }
-
-    Rectangle {
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
-        height:1
-        color: "#2F2F2F"
-        z: 2
-    }
-}

components/DaemonManagerDialog.qml

@@ -26,7 +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 QtQuick 2.0
+import QtQuick 2.9
 import QtQuick.Controls 1.4
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
@@ -89,12 +89,14 @@ Window {
                 }
             }
 
-            Text {
-                text: qsTr("Starting local node in %1 seconds").arg(countDown);
+            MoneroComponents.TextPlain {
+                text: qsTr("Starting local node in %1 seconds").arg(countDown) + translationManager.emptyString;
                 font.pixelSize: 18
                 Layout.alignment: Qt.AlignHCenter
                 Layout.fillWidth: true
                 horizontalAlignment: Text.AlignHCenter
+                themeTransition: false
+                color: "black"
             }
 
         }
@@ -108,7 +110,7 @@ Window {
                 id: okButton
                 visible:false
                 fontSize: 14
-                text: qsTr("Start daemon (%1)").arg(countDown)
+                text: qsTr("Start daemon (%1)").arg(countDown) + translationManager.emptyString
                 KeyNavigation.tab: cancelButton
                 onClicked: {
                     timer.stop();
@@ -121,7 +123,7 @@ Window {
             MoneroComponents.StandardButton {
                 id: cancelButton
                 fontSize: 14
-                text: qsTr("Use custom settings")
+                text: qsTr("Use custom settings") + translationManager.emptyString
 
                 onClicked: {
                     timer.stop();

components/DashboardTable.qml

@@ -1,252 +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.0
-import moneroComponents.Clipboard 1.0
-
-ListView {
-    id: listView
-    clip: true
-    boundsBehavior: ListView.StopAtBounds
-    
-    footer: Rectangle {
-        height: 127
-        width: listView.width
-        color: "#FFFFFF"
-
-        Text {
-            anchors.centerIn: parent
-            font.family: "Arial"
-            font.pixelSize: 14
-            color: "#545454"
-            text: qsTr("No more results") + translationManager.emptyString
-        }
-    }
-
-    property var previousItem
-    delegate: Rectangle {
-        id: delegate
-        height: 90
-        width: listView.width
-        color: index % 2 ? "#F8F8F8" : "#FFFFFF"
-        z: listView.count - index
-        function collapseDropdown() { dropdown.expanded = false }
-        
-        Row {
-            id: row1
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.topMargin: 14
-            
-            Rectangle {
-                id: dot
-                width: 14
-                height: width
-                radius: width / 2
-                color: out ? "#FF4F41" : "#36B05B"
-            }
-            
-            Item { //separator
-                width: 12
-                height: 14
-            }
-            
-            Text {
-                id: descriptionText
-                width: text.length ? (descriptionArea.containsMouse ? parent.width - x - 12 : 120) : 0
-                anchors.verticalCenter: dot.verticalCenter
-                font.family: "Arial"
-                font.bold: true
-                font.pixelSize: 19
-                color: "#444444"
-                elide: Text.ElideRight
-                text: description
-
-                MouseArea {
-                    id: descriptionArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                }
-            }
-            
-            Item { //separator
-                width: descriptionText.width ? 12 : 0
-                height: 14
-                visible: !descriptionArea.containsMouse
-            }
-            
-            Text {
-                id: addressText
-                anchors.verticalCenter: dot.verticalCenter
-                width: parent.width - x - 12
-                elide: Text.ElideRight
-                font.family: "Arial"
-                font.pixelSize: 14
-                color: "#545454"
-                text: address
-                visible: !descriptionArea.containsMouse
-            }
-        }
-        
-        Row {
-            anchors.left: parent.left
-            anchors.top: row1.bottom
-            anchors.topMargin: 8
-            spacing: 12
-            
-            Item { //separator
-                width: 14
-                height: 14
-            }
-            
-            Column {
-                anchors.top: parent.top
-                width: 215
-                
-                Text {
-                    anchors.left: parent.left
-                    font.family: "Arial"
-                    font.pixelSize: 12
-                    color: "#545454"
-                    text: qsTr("Date")  + translationManager.emptyString
-                }
-                
-                Row {
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    spacing: 33
-
-                    Text {
-                        font.family: "Arial"
-                        font.pixelSize: 18
-                        color: "#000000"
-                        text: date
-                    }
-
-                    Text {
-                        font.family: "Arial"
-                        font.pixelSize: 18
-                        color: "#000000"
-                        text: time
-                    }
-                }
-            }
-            
-            Column {
-                anchors.top: parent.top
-                width: 148
-                
-                Text {
-                    anchors.left: parent.left
-                    font.family: "Arial"
-                    font.pixelSize: 12
-                    color: "#545454"
-                    text: qsTr("Balance") + translationManager.emptyString
-                }
-                
-                Text {
-                    font.family: "Arial"
-                    font.pixelSize: 18
-                    color: "#000000"
-                    text: balance
-                }
-            }
-            
-            Column {
-                anchors.top: parent.top
-                width: 148
-                
-                Text {
-                    anchors.left: parent.left
-                    font.family: "Arial"
-                    font.pixelSize: 12
-                    color: "#545454"
-                    text: qsTr("Amount") + translationManager.emptyString
-                }
-                
-                Row {
-                    spacing: 2
-                    Text {
-                        anchors.bottom: parent.bottom
-                        anchors.bottomMargin: 3
-                        font.family: "Arial"
-                        font.pixelSize: 16
-                        color: out ? "#FF4F41" : "#36B05B"
-                        text: out ? "↓" : "↑"
-                    }
-                    
-                    Text {
-                        anchors.bottom: parent.bottom
-                        font.family: "Arial"
-                        font.pixelSize: 18
-                        color: out ? "#FF4F41" : "#36B05B"
-                        text: amount
-                    }
-                }
-            }
-        }
-
-        ListModel {
-            id: dropModel
-            ListElement { name: "<b>Copy address to clipboard</b>"; icon: "../images/dropdownCopy.png" }
-            ListElement { name: "<b>Add to address book</b>"; icon: "../images/dropdownAdd.png" }
-            ListElement { name: "<b>Send to this address</b>"; icon: "../images/dropdownSend.png" }
-            ListElement { name: "<b>Find similar transactions</b>"; icon: "../images/dropdownSearch.png" }
-        }
-
-        Clipboard { id: clipboard }
-        TableDropdown {
-            id: dropdown
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 11
-            anchors.rightMargin: 5
-            dataModel: dropModel
-            z: 1
-            onExpandedChanged: {
-                if(expanded) {
-                    listView.previousItem = delegate
-                    listView.currentIndex = index
-                }
-            }
-            onOptionClicked: {
-                if(option === 0)
-                    clipboard.setText(address)
-            }
-        }
-
-        Rectangle {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            height: 1
-            color: "#DBDBDB"
-        }
-    }
-}

components/DatePicker.qml

@@ -26,18 +26,22 @@
 // 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.2
+import QtQuick 2.9
 import QtQuick.Controls 1.2
+import QtQuick.Controls 2.2 as QtQuickControls2
+import QtQuick.Layouts 1.2
+import QtGraphicalEffects 1.0
 import QtQuick.Controls.Styles 1.2
 
-import "../components" as MoneroComponents
+import "." as MoneroComponents
+import "effects/" as MoneroEffects
 
 Item {
     id: datePicker
-    property bool expanded: false
+    readonly property alias expanded: popup.visible
     property date currentDate
     property bool showCurrentDate: true
-    property color backgroundColor : "#404040"
+    property color backgroundColor : MoneroComponents.Style.appWindowBorderColor
     property color errorColor : "red"
     property bool error: false
     property alias inputLabel: inputLabel
@@ -48,26 +52,13 @@ Item {
 
     onExpandedChanged: if(expanded) appWindow.currentItem = datePicker
 
-    function hide() { datePicker.expanded = false }
-    function containsPoint(px, py) {
-        if(px < 0)
-            return false
-        if(px > width)
-            return false
-        if(py < 0)
-            return false
-        if(py > height + calendarRect.height)
-            return false
-        return true
-    }
-
     Rectangle {
         id: inputLabelRect
         color: "transparent"
         height: 22
         width: parent.width
 
-        Text {
+        MoneroComponents.TextPlain {
             id: inputLabel
             anchors.top: parent.top
             anchors.topMargin: 2
@@ -77,6 +68,7 @@ Item {
             font.bold: false
             textFormat: Text.RichText
             color: MoneroComponents.Style.defaultFontColor
+            themeTransition: false
 
             MouseArea {
                 anchors.fill: parent
@@ -89,7 +81,7 @@ Item {
     Item {
         id: head
         anchors.top: inputLabelRect.bottom
-        anchors.topMargin: 6 * scaleRatio
+        anchors.topMargin: 6
         anchors.left: parent.left
         anchors.right: parent.right
         height: 28
@@ -106,45 +98,14 @@ Item {
             color: datePicker.backgroundColor
         }
 
-        Item {
-            id: buttonItem
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.margins: 4
-            width: height
-
-            Image {
-                id: button
-                anchors.centerIn: parent
-                source: "../images/whiteDropIndicator.png"
-                rotation: datePicker.expanded ? 180 : 0
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: datePicker.expanded = !datePicker.expanded
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-            }
-        }
-
-        Rectangle {
-            id: separator
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.right: buttonItem.left
-            anchors.rightMargin: 4
-            height: 16
-            width: 1
-            color: "#808080"
-            visible: datePicker.expanded
-        }
-
-        Row {
+        RowLayout {
             id: dateInput
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
-            anchors.leftMargin: 10
+            anchors.leftMargin: 2
+            anchors.right: parent.right
+            property string headerFontColor: MoneroComponents.Style.blackTheme ? "#e6e6e6" : "#333333"
+            spacing: 0
 
             function setDate(date) {
                 var day = date.getDate()
@@ -156,7 +117,7 @@ Item {
 
             Connections {
                 target: datePicker
-                onCurrentDateChanged: {
+                function onCurrentDateChanged() {
                     dateInput.setDate(datePicker.currentDate)
                 }
             }
@@ -164,12 +125,14 @@ Item {
             TextInput {
                 id: dayInput
                 readOnly: true
-                width: 22
+                Layout.preferredWidth: childrenRect.width + 40
                 font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
-                color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
-                maximumLength: 2
+                color: datePicker.error ? errorColor : parent.headerFontColor
+                selectionColor: MoneroComponents.Style.dimmedFontColor
+                selectByMouse: true
                 horizontalAlignment: TextInput.AlignHCenter
+                maximumLength: 2
                 validator: IntValidator{bottom: 01; top: 31;}
                 KeyNavigation.tab: monthInput
 
@@ -187,22 +150,25 @@ Item {
                 }
             }
 
-            Text {
+            MoneroComponents.TextPlain {
                 font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
                 color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 text: "-"
+                themeTransition: false
             }
 
             TextInput {
                 id: monthInput
                 readOnly: true
-                width: 22
+                Layout.preferredWidth: childrenRect.width + 40
                 font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
-                color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
-                maximumLength: 2
+                color: datePicker.error ? errorColor : parent.headerFontColor
+                selectionColor: MoneroComponents.Style.dimmedFontColor
+                selectByMouse: true
                 horizontalAlignment: TextInput.AlignHCenter
+                maximumLength: 2
                 validator: IntValidator{bottom: 01; top: 12;}
                 KeyNavigation.tab: yearInput
                 text: {
@@ -219,23 +185,27 @@ Item {
                 }
             }
 
-            Text {
+            MoneroComponents.TextPlain {
                 font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
                 color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 text: "-"
+                themeTransition: false
             }
 
             TextInput {
                 id: yearInput
-                width: 44
+                Layout.preferredWidth: childrenRect.width + 60
                 font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
-                color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
-                maximumLength: 4
+                color: datePicker.error ? errorColor : parent.headerFontColor
+                selectionColor: MoneroComponents.Style.dimmedFontColor
+                selectByMouse: true
                 horizontalAlignment: TextInput.AlignHCenter
+                maximumLength: 4
                 validator: IntValidator{bottom: 1000; top: 9999;}
                 text: if(datePicker.showCurrentDate) datePicker.currentDate.getFullYear()
+
                 onFocusChanged: {
                     if(focus === false) {
                         var d = new Date()
@@ -245,151 +215,238 @@ Item {
                     }
                 }
             }
+
+            Rectangle {
+                Layout.preferredHeight: parent.height
+                Layout.fillWidth: true
+                color: "transparent"
+
+                Image {
+                    id: button
+                    anchors.right: parent.right
+                    anchors.rightMargin: 10
+                    anchors.verticalCenter: parent.verticalCenter
+                    source: "qrc:///images/whiteDropIndicator.png"
+                    visible: false
+                }
+
+                ColorOverlay {
+                    source: button
+                    anchors.fill: button
+                    color: MoneroComponents.Style.defaultFontColor
+                    rotation: datePicker.expanded ? 180 : 0
+                    opacity: 1
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: datePicker.expanded ? popup.close() : popup.open()
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                }
+            }
         }
     }
 
-    Rectangle {
-        id: calendarRect
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: head.bottom
-        color: "#FFFFFF"
-        border.width: 1
-        border.color: "#DBDBDB"
-        height: datePicker.expanded ? calendar.height + 2 : 0
-        clip: true
-        //radius: 4
-
-        Behavior on height {
-            NumberAnimation { duration: 100; easing.type: Easing.InQuad }
-        }
+    QtQuickControls2.Popup {
+        id: popup
+        padding: 0
+        closePolicy: QtQuickControls2.Popup.CloseOnEscape | QtQuickControls2.Popup.CloseOnPressOutsideParent
 
         Rectangle {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.leftMargin: 1
-            anchors.rightMargin: 1
-            anchors.top: parent.top
-            color: "#FFFFFF"
-            height: 1
-        }
+            id: calendarRect
+            width: head.width
+            x: head.x
+            y: head.y + head.height + 10
 
-        Calendar {
-            id: calendar
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.margins: 1
-            height: 180
-            frameVisible: false
+            color: MoneroComponents.Style.middlePanelBackgroundColor
+            border.width: 1
+            border.color: MoneroComponents.Style.appWindowBorderColor
+            height: datePicker.expanded ? calendar.height + 2 : 0
+            clip: true
 
-            style: CalendarStyle {
-                gridVisible: false
-                background: Rectangle { color: "transparent" }
-                dayDelegate: Item {
-                    z: parent.z + 1
-                    implicitHeight: implicitWidth
-                    implicitWidth: calendar.width / 7
+            Behavior on height {
+                NumberAnimation { duration: 100; easing.type: Easing.InQuad }
+            }
 
-                    Rectangle {
-                        anchors.fill: parent
-                        radius: parent.implicitHeight / 2
-                        color: dayArea.pressed && styleData.visibleMonth ? "#FF6C3B" : "transparent"
-                    }
+            MouseArea {
+                anchors.fill: parent
+            }
 
-                    Text {
-                        anchors.centerIn: parent
-                        font.family: "Arial"
-                        font.pixelSize: 12
-                        font.bold: dayArea.pressed
-                        text: styleData.date.getDate()
-                        color: {
-                            if(!styleData.visibleMonth) return "#DBDBDB"
-                            if(dayArea.pressed) return "#FFFFFF"
-                            if(styleData.today) return "#FF6C3B"
-                            return "#4A4848"
+            Rectangle {
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.leftMargin: 1
+                anchors.rightMargin: 1
+                anchors.top: parent.top
+                color: MoneroComponents.Style.appWindowBorderColor
+                height: 1
+            }
+
+            Calendar {
+                id: calendar
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.top: parent.top
+                anchors.margins: 1
+                anchors.bottomMargin: 10
+                height: 220
+                frameVisible: false
+
+                style: CalendarStyle {
+                    gridVisible: false
+                    background: Rectangle { color: MoneroComponents.Style.middlePanelBackgroundColor }
+                    dayDelegate: Item {
+                        z: parent.z + 1
+                        implicitHeight: implicitWidth
+                        implicitWidth: calendar.width / 7
+
+                        Rectangle {
+                            id: dayRect
+                            anchors.fill: parent
+                            radius: parent.implicitHeight / 2
+                            color: {
+                                if(dayArea.pressed && styleData.visibleMonth)
+                                    return MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000"
+                                return "transparent";
+                            }
+                        }
+
+                        MoneroComponents.TextPlain {
+                            id: dayText
+                            anchors.centerIn: parent
+                            font.family: MoneroComponents.Style.fontMonoRegular.name
+                            font.pixelSize: {
+                                if(!styleData.visibleMonth) return 12
+                                return 14
+                            }
+                            font.bold: {
+                                if(dayArea.pressed || styleData.visibleMonth) return true;
+                                return false;
+                            }
+                            text: styleData.date.getDate()
+                            themeTransition: false
+                            color: {
+                                if(!styleData.visibleMonth) return MoneroComponents.Style.lightGreyFontColor
+                                if(dayArea.pressed) return MoneroComponents.Style.defaultFontColor
+                                if(styleData.today) return MoneroComponents.Style.orange
+                                return MoneroComponents.Style.defaultFontColor
+                            }
+                        }
+
+                        MouseArea {
+                            id: dayArea
+                            anchors.fill: parent
+                            hoverEnabled: true
+                            onEntered: dayRect.color = MoneroComponents.Style.blackTheme ? "#20FFFFFF" : "#10000000"
+                            onExited: dayRect.color = "transparent"
+                            cursorShape: Qt.PointingHandCursor
+                            onClicked: {
+                                if(styleData.visibleMonth) {
+                                    currentDate = styleData.date
+                                    popup.close()
+                                } else {
+                                    var date = styleData.date
+                                    if(date.getMonth() > calendar.visibleMonth)
+                                        calendar.showNextMonth()
+                                    else calendar.showPreviousMonth()
+                                }
+
+                                datePicker.dateChanged();
+                            }
                         }
                     }
 
-                    MouseArea {
-                        id: dayArea
-                        anchors.fill: parent
-                        onClicked: {
-                            if(styleData.visibleMonth) {
-                                currentDate = styleData.date
-                                datePicker.expanded = false
-                            } else {
-                                var date = styleData.date
-                                if(date.getMonth() > calendar.visibleMonth)
-                                    calendar.showNextMonth()
-                                else calendar.showPreviousMonth()
+                    dayOfWeekDelegate: Item {
+                        implicitHeight: 20
+                        implicitWidth: calendar.width / 7
+
+                        MoneroComponents.TextPlain {
+                            anchors.centerIn: parent
+                            elide: Text.ElideRight
+                            font.family: MoneroComponents.Style.fontMonoRegular.name
+                            font.pixelSize: 12
+                            color: MoneroComponents.Style.lightGreyFontColor
+                            themeTransition: false
+                            text: {
+                                var locale = Qt.locale()
+                                return locale.dayName(styleData.dayOfWeek, Locale.ShortFormat)
+                            }
+                        }
+                    }
+
+                    navigationBar: Rectangle {
+                        color: MoneroComponents.Style.middlePanelBackgroundColor
+                        implicitWidth: calendar.width
+                        implicitHeight: 30
+
+                        MoneroComponents.TextPlain {
+                            anchors.centerIn: parent
+                            font.family: MoneroComponents.Style.fontMonoRegular.name
+                            font.pixelSize: 14
+                            color: MoneroComponents.Style.dimmedFontColor
+                            themeTransition: false
+                            text: styleData.title
+                        }
+
+
+                        Item {
+                            anchors.left: parent.left
+                            anchors.leftMargin: 4
+                            anchors.top: parent.top
+                            anchors.bottom: parent.bottom
+                            width: height
+
+                            Image {
+                                id: prevMonthIcon
+                                anchors.centerIn: parent
+                                source: "qrc:///images/prevMonth.png"
+                                visible: false
                             }
 
-                            dateChanged();
-                        }
-                    }
-                }
+                            ColorOverlay {
+                                source: prevMonthIcon
+                                anchors.fill: prevMonthIcon
+                                color: MoneroComponents.Style.defaultFontColor
+                                opacity: 0.5
+                            }
 
-                dayOfWeekDelegate: Item {
-                    implicitHeight: 20
-                    implicitWidth: calendar.width / 7
-
-                    Text {
-                        anchors.centerIn: parent
-                        elide: Text.ElideRight
-                        font.family: "Arial"
-                        font.pixelSize: 9
-                        color: "#535353"
-                        text: {
-                            var locale = Qt.locale()
-                            return locale.dayName(styleData.dayOfWeek, Locale.ShortFormat)
-                        }
-                    }
-                }
-
-                navigationBar: Rectangle {
-                    implicitWidth: calendar.width
-                    implicitHeight: 30
-
-                    Text {
-                        anchors.centerIn: parent
-                        font.family: "Arial"
-                        font.pixelSize: 12
-                        color: "#4A4646"
-                        text: styleData.title
-                    }
-
-                    Item {
-                        anchors.left: parent.left
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
-                        width: height
-
-                        Image {
-                            anchors.centerIn: parent
-                            source: "../images/prevMonth.png"
+                            MouseArea {
+                                hoverEnabled: true
+                                cursorShape: Qt.PointingHandCursor
+                                anchors.fill: parent
+                                onClicked: calendar.showPreviousMonth()
+                            }
                         }
 
-                        MouseArea {
-                            anchors.fill: parent
-                            onClicked: calendar.showPreviousMonth()
-                        }
-                    }
+                        Item {
+                            anchors.right: parent.right
+                            anchors.rightMargin: 4
+                            anchors.top: parent.top
+                            anchors.bottom: parent.bottom
+                            width: height
 
-                    Item {
-                        anchors.right: parent.right
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
-                        width: height
+                            Image {
+                                id: nextMonthIcon
+                                anchors.centerIn: parent
+                                source: "qrc:///images/prevMonth.png"
+                                visible: false
+                            }
 
-                        Image {
-                            anchors.centerIn: parent
-                            source: "../images/nextMonth.png"
-                        }
+                            ColorOverlay {
+                                source: nextMonthIcon
+                                anchors.fill: nextMonthIcon
+                                color: MoneroComponents.Style.defaultFontColor
+                                opacity: 0.5
+                                rotation: 180
+                            }
 
-                        MouseArea {
-                            anchors.fill: parent
-                            onClicked: calendar.showNextMonth()
+                            MouseArea {
+                                hoverEnabled: true
+                                cursorShape: Qt.PointingHandCursor
+                                anchors.fill: parent
+                                onClicked: calendar.showNextMonth()
+                            }
                         }
                     }
                 }

components/DevicePassphraseDialog.qml

@@ -0,0 +1,104 @@
+// 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 "." as MoneroComponents
+
+Item {
+    id: root
+
+    property var onAcceptedCallback
+    property var onWalletEntryCallback
+    property var onRejectedCallback
+
+    function open(canEnterOnDevice_) {
+        var canEnterOnDevice = canEnterOnDevice_ !== null ? canEnterOnDevice_ : canEnterOnDevice
+        root.visible = true;
+
+        if (canEnterOnDevice) {
+            entryChooserDialog.okText = qsTr("Hardware wallet")
+            entryChooserDialog.cancelText = qsTr("Computer")
+            entryChooserDialog.open()
+        } else {
+            openPassphraseDialog()
+        }
+    }
+
+    function openPassphraseDialog() {
+        root.visible = true
+        passphraseDialog.openPassphraseDialog()
+    }
+
+    function close() {
+        root.visible = false;
+        if (entryChooserDialog.visible)
+            entryChooserDialog.close()
+        if (passphraseDialog.visible)
+            passphraseDialog.close()
+    }
+
+    StandardDialog {
+        id: entryChooserDialog
+        title: qsTr("Hardware wallet passphrase") + translationManager.emptyString
+        text: qsTr("Please select where you want to enter passphrase.\nIt is recommended to enter passphrase on the hardware wallet for better security.") + translationManager.emptyString
+
+        onAccepted: {
+            if (onWalletEntryCallback){
+                onWalletEntryCallback()
+            }
+        }
+
+        onRejected: {
+            openPassphraseDialog()
+        }
+
+        onCloseCallback: {
+            root.close()
+        }
+    }
+
+    PasswordDialog {
+        id: passphraseDialog
+        anchors.fill: parent
+        passphraseDialogMode: true
+
+        onAcceptedPassphrase: {
+            if (onAcceptedCallback)
+                onAcceptedCallback(passphraseDialog.password);
+        }
+
+        onRejectedPassphrase: {
+            if (onRejectedCallback)
+                onRejectedCallback();
+        }
+
+        onCloseCallback: {
+            root.close()
+        }
+    }
+}

components/HistoryTable.qml

@@ -1,484 +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.0
-import moneroComponents.Clipboard 1.0
-import moneroComponents.AddressBookModel 1.0
-
-import "../components" as MoneroComponents
-import "../js/TxUtils.js" as TxUtils
-
-ListView {
-    id: listView
-    clip: true
-    boundsBehavior: ListView.StopAtBounds
-    property var previousItem
-    property int rowSpacing: 12
-    property var addressBookModel: null
-
-    function buildTxDetailsString(tx_id, paymentId, tx_key,tx_note, destinations, rings) {
-        var trStart = '<tr><td width="85" style="padding-top:5px"><b>',
-            trMiddle = '</b></td><td style="padding-left:10px;padding-top:5px;">',
-            trEnd = "</td></tr>";
-
-        return '<table border="0">'
-            + (tx_id ? trStart + qsTr("Tx ID:") + trMiddle + tx_id + trEnd : "")
-            + (paymentId ? trStart + qsTr("Payment ID:") + trMiddle + paymentId  + trEnd : "")
-            + (tx_key ? trStart + qsTr("Tx key:") + trMiddle + tx_key + trEnd : "")
-            + (tx_note ? trStart + qsTr("Tx note:") + trMiddle + tx_note  + trEnd : "")
-            + (destinations ? trStart + qsTr("Destinations:") + trMiddle + destinations + trEnd : "")
-            + (rings ? trStart + qsTr("Rings:") + trMiddle + rings + trEnd : "")
-            + "</table>"
-            + translationManager.emptyString;
-    }
-
-    function lookupPaymentID(paymentId) {
-        if (!addressBookModel)
-            return ""
-        var idx = addressBookModel.lookupPaymentID(paymentId)
-        if (idx < 0)
-            return ""
-        idx = addressBookModel.index(idx, 0)
-        return addressBookModel.data(idx, AddressBookModel.AddressBookDescriptionRole)
-    }
-
-    footer: Rectangle {
-        height: 127 * scaleRatio
-        width: listView.width
-        color: "transparent"
-
-        Text {
-            anchors.centerIn: parent
-            font.family: "Arial"
-            font.pixelSize: 14
-            color: "#545454"
-            text: qsTr("No more results") + translationManager.emptyString
-        }
-    }
-
-    delegate: Rectangle {
-        id: delegate
-        property bool collapsed: index ? false : true
-        height: collapsed ? 180 * scaleRatio : 70 * scaleRatio
-        width: listView.width
-        color: "transparent"
-
-        function collapse(){
-            delegate.height = 180 * scaleRatio;
-        }
-
-        // borders
-        Rectangle{
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            width: 1
-            color: "#404040"
-        }
-
-        Rectangle{
-            anchors.left: parent.left
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            width: collapsed ? 2 : 1
-            color: collapsed ? "#BBBBBB" : "#404040"
-        }
-
-        Rectangle{
-            anchors.right: parent.right
-            anchors.bottom: parent.top
-            anchors.left: parent.left
-            height: 1
-            color: "#404040"
-        }
-
-        Rectangle{
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            height: 1
-            color: "#404040"
-        }
-
-        Rectangle {
-            id: row1
-            anchors.left: parent.left
-            anchors.leftMargin: 20 * scaleRatio
-            anchors.right: parent.right
-            anchors.rightMargin: 20 * scaleRatio
-            anchors.top: parent.top
-            anchors.topMargin: 15 * scaleRatio
-            height: 40 * scaleRatio
-            color: "transparent"
-
-            Image {
-                id: arrowImage
-                source: isOut ? "../images/downArrow.png" : "../images/upArrow-green.png"
-                height: 18 * scaleRatio
-                width: 12 * scaleRatio
-                anchors.top: parent.top
-                anchors.topMargin: 12 * scaleRatio
-            }
-
-            Text {
-                id: txrxLabel
-                anchors.left: arrowImage.right
-                anchors.leftMargin: 18 * scaleRatio
-                font.family: MoneroComponents.Style.fontLight.name
-                font.pixelSize: 14 * scaleRatio
-                text: isOut ? "Sent" : "Received"
-                color: "#808080"
-            }
-
-            Text {
-                id: amountLabel
-                anchors.left: arrowImage.right
-                anchors.leftMargin: 18 * scaleRatio
-                anchors.top: txrxLabel.bottom
-                anchors.topMargin: 0 * scaleRatio
-                font.family: MoneroComponents.Style.fontBold.name
-                font.pixelSize: 18 * scaleRatio
-                font.bold: true
-                text: {
-                    var _amount = amount;
-                    if(_amount === 0){
-                        // *sometimes* amount is 0, while the 'destinations string' 
-                        // has the correct amount, so we try to fetch it from that instead.
-                        _amount = TxUtils.destinationsToAmount(destinations);
-                        _amount = (_amount *1);
-                    }
-
-                    return _amount + " XMR";
-                }
-                color: isOut ? "white" : "#2eb358"
-            }
-
-            Rectangle {
-                anchors.right: parent.right
-                width: 300 * scaleRatio
-                height: parent.height
-                color: "transparent"
-
-                Text {
-                    id: dateLabel
-                    anchors.left: parent.left
-                    font.family: MoneroComponents.Style.fontRegular.name
-                    font.pixelSize: 14 * scaleRatio
-                    text: date
-                    color: "#808080"
-                }
-
-                Text {
-                    id: timeLabel
-                    anchors.left: dateLabel.right
-                    anchors.leftMargin: 7 * scaleRatio
-                    anchors.top: parent.top
-                    anchors.topMargin: 3 * scaleRatio
-                    font.pixelSize: 12 * scaleRatio
-                    text: time
-                    color: "#808080"
-                }
-
-                Text {
-                    id: toLabel
-                    property string address: ""
-                    color: "#BBBBBB"
-                    anchors.left: parent.left
-                    anchors.top: dateLabel.bottom
-                    anchors.topMargin: 0
-                    font.family: MoneroComponents.Style.fontRegular.name
-                    font.pixelSize: 16 * scaleRatio
-                    text: {
-                        if(isOut){
-                            address = TxUtils.destinationsToAddress(destinations);
-                            if(address){
-                                var truncated = TxUtils.addressTruncate(address);
-                                return "To " + truncated;
-                            } else {
-                                return "Unknown recipient";
-                            }
-                        }
-                        return "";
-                    }
-
-                    MouseArea{
-                        visible: parent.address !== undefined
-                        hoverEnabled: true
-                        anchors.fill: parent
-                        cursorShape: Qt.PointingHandCursor
-                        onEntered: {
-                            toLabel.color = "white";
-                        }
-                        onExited: {
-                            toLabel.color = "#BBBBBB";
-                        }
-                        onClicked: {
-                            if(parent.address){
-                                console.log("Address copied to clipboard");
-                                clipboard.setText(parent.address);
-                                appWindow.showStatusMessage(qsTr("Address copied to clipboard"),3)
-                            }
-                        }
-                    }
-                }
-
-                Rectangle {
-                    height: 24 * scaleRatio
-                    width: 24 * scaleRatio
-                    color: "transparent"
-                    anchors.right: parent.right
-                    anchors.verticalCenter: parent.verticalCenter
-
-                    Image {
-                        id: dropdownImage
-                        height: 8 * scaleRatio
-                        width: 12 * scaleRatio
-                        source: "../images/whiteDropIndicator.png"
-                        rotation: delegate.collapsed ? 180 : 0
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    MouseArea{
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: {
-                            delegate.collapsed = !delegate.collapsed;
-                        }
-                    }
-                }
-            }
-        }
-
-        Rectangle {
-            id: row2
-            anchors.left: parent.left
-            anchors.leftMargin: 20 * scaleRatio
-            anchors.right: parent.right
-            anchors.rightMargin: 20 * scaleRatio
-            anchors.top: row1.bottom
-            anchors.topMargin: 15 * scaleRatio
-            height: 40 * scaleRatio
-            color: "transparent"
-            visible: delegate.collapsed
-
-            // left column
-            MoneroComponents.HistoryTableInnerColumn{
-                anchors.left: parent.left
-                anchors.leftMargin: 30 * scaleRatio
-
-                labelHeader: "Transaction ID"
-                labelValue: hash.substring(0, 18) + "..."
-                copyValue: hash
-            }
-
-            // right column
-            MoneroComponents.HistoryTableInnerColumn{
-                anchors.right: parent.right
-                anchors.rightMargin: 100 * scaleRatio
-                width: 200 * scaleRatio
-                height: parent.height
-                color: "transparent"
-
-                labelHeader: qsTr("Fee")
-                labelValue: {
-                    if(!isOut && !fee){
-                        return "-";
-                    } else if(isOut && fee){
-                        return fee + " XMR";
-                    } else {
-                        return "Unknown"
-                    }
-                }
-                copyValue: {
-                    if(isOut && fee){ return fee }
-                    else { return "" }
-                }
-            }
-
-        }
-
-        Rectangle {
-            id: row3
-            anchors.left: parent.left
-            anchors.leftMargin: 20 * scaleRatio
-            anchors.right: parent.right
-            anchors.rightMargin: 20 * scaleRatio
-            anchors.top: row2.bottom
-            anchors.topMargin: 15 * scaleRatio
-            height: 40 * scaleRatio
-            color: "transparent"
-            visible: delegate.collapsed
-
-            // left column
-            MoneroComponents.HistoryTableInnerColumn{
-                anchors.left: parent.left
-                anchors.leftMargin: 30 * scaleRatio
-                labelHeader: qsTr("Blockheight")
-                labelValue: {
-                    if (!isPending)
-                        if(confirmations < confirmationsRequired)
-                            return blockHeight + " " + qsTr("(%1/%2 confirmations)").arg(confirmations).arg(confirmationsRequired);
-                        else
-                            return blockHeight;
-                    if (!isOut)
-                        return qsTr("UNCONFIRMED") + translationManager.emptyString
-                    if (isFailed)
-                        return qsTr("FAILED") + translationManager.emptyString
-                    return qsTr("PENDING") + translationManager.emptyString
-                }
-                copyValue: labelValue
-            }
-
-            // right column
-            MoneroComponents.HistoryTableInnerColumn {
-                visible: currentWallet.getUserNote(hash)
-                anchors.right: parent.right
-                anchors.rightMargin: 80 * scaleRatio
-                width: 220 * scaleRatio
-                height: parent.height
-                color: "transparent"
-
-                labelHeader: qsTr("Description")
-                labelValue: {
-                    var note = currentWallet.getUserNote(hash);
-                    if(note){
-                        if(note.length > 28) {
-                            return note.substring(0, 28) + "...";
-                        } else {
-                            return note;
-                        }
-                    } else {
-                        return "";
-                    }
-                }
-                copyValue: {
-                    return currentWallet.getUserNote(hash);
-                }
-            }
-
-            Rectangle {
-                id: proofButton
-                visible: isOut
-                color: "#404040"
-                height: 24 * scaleRatio
-                width: 24 * scaleRatio
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: 36
-                radius: 20 * scaleRatio
-
-                MouseArea {
-                    id: proofButtonMouseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        var address = TxUtils.destinationsToAddress(destinations);
-                        if(address === undefined){
-                            console.log('getProof: Error fetching address')
-                            return;
-                        }
-
-                        var checked = (TxUtils.checkTxID(hash) && TxUtils.checkAddress(address, appWindow.persistentSettings.nettype));
-                        if(!checked){
-                            console.log('getProof: Error checking TxId and/or address');
-                        }
-
-                        console.log("getProof: Generate clicked: txid " + hash + ", address " + address);
-                        root.getProofClicked(hash, address, '');
-                    }
-
-                    onEntered: {
-                        proofButton.color = "#656565";
-                    }
-
-                    onExited: {
-                        proofButton.color = "#404040";
-                    }
-                }
-
-                Text {
-                    color: MoneroComponents.Style.defaultFontColor
-                    text: "P"
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    anchors.verticalCenter: parent.verticalCenter
-                    font.pixelSize: 14 * scaleRatio
-                }
-            }
-
-            Rectangle {
-                id: detailsButton
-                color: "#404040"
-                height: 24 * scaleRatio
-                width: 24 * scaleRatio
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: 6
-                radius: 20 * scaleRatio
-
-                MouseArea {
-                    id: detailsButtonMouseArea
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        var tx_key = currentWallet.getTxKey(hash)
-                        var tx_note = currentWallet.getUserNote(hash)
-                        var rings = currentWallet.getRings(hash)
-                        if (rings)
-                            rings = rings.replace(/\|/g, '\n')
-                        informationPopup.title = "Transaction details";
-                        informationPopup.content = buildTxDetailsString(hash,paymentId,tx_key,tx_note,destinations, rings);
-                        informationPopup.onCloseCallback = null
-                        informationPopup.open();
-                    }
-
-                    onEntered: {
-                        detailsButton.color = "#656565";
-                    }
-
-                    onExited: {
-                        detailsButton.color = "#404040";
-                    }
-                }
-
-                Text {
-                    color: MoneroComponents.Style.defaultFontColor
-                    text: "?"
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    anchors.verticalCenter: parent.verticalCenter
-                    font.pixelSize: 14 * scaleRatio
-                }
-            }
-        }
-    }
-
-    Clipboard { id: clipboard }
-}

components/HistoryTableInnerColumn.qml

@@ -1,91 +0,0 @@
-// Copyright (c) 2014-2015, 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.0
-import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.2
-import moneroComponents.Clipboard 1.0
-import moneroComponents.PendingTransaction 1.0
-import moneroComponents.Wallet 1.0
-
-import "../components" as MoneroComponents
-
-
-Rectangle{
-    Clipboard { id: clipboard }
-
-    width: label1.width > label2.width ? label1.width : label2.width
-    height: label1.height + label2.height
-    color: "transparent"
-
-    property string copyValue: ""
-    property alias labelHeader: label1.text
-    property alias labelValue: label2.text
-
-    Text {
-        id: label1
-        anchors.left: parent.left
-        font.family: MoneroComponents.Style.fontRegular.name
-        font.pixelSize: 14 * scaleRatio
-        text: labelHeader
-        color: MoneroComponents.Style.greyFontColor
-    }
-
-    Text {
-        id: label2
-        anchors.left: parent.left
-        anchors.top: label1.bottom
-        font.family: MoneroComponents.Style.fontRegular.name
-        font.pixelSize: 14 * scaleRatio
-        text: labelValue
-        color: MoneroComponents.Style.dimmedFontColor
-    }
-
-    // hover effect / copy value
-    MouseArea {
-        visible: copyValue !== ""
-        hoverEnabled: true
-        anchors.fill: parent
-        cursorShape: Qt.PointingHandCursor
-        onEntered: {
-            label1.color = MoneroComponents.Style.defaultFontColor;
-            label2.color = MoneroComponents.Style.defaultFontColor;
-        }
-        onExited: {
-            label1.color = MoneroComponents.Style.greyFontColor;
-            label2.color = MoneroComponents.Style.dimmedFontColor;
-        }
-        onClicked: {
-            if(copyValue){
-                console.log("Copied to clipboard");
-                clipboard.setText(copyValue);
-                appWindow.showStatusMessage(qsTr("Copied to clipboard"),3)
-            }
-        }
-    }
-}

components/HistoryTableMobile.qml

@@ -1,222 +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.0
-import QtQuick.Layouts 1.1
-import moneroComponents.Clipboard 1.0
-import moneroComponents.AddressBookModel 1.0
-
-import "../components" as MoneroComponents
-
-ListView {
-    id: listView
-    clip: true
-    boundsBehavior: ListView.StopAtBounds
-    property var previousItem
-    property var addressBookModel: null
-
-    function buildTxDetailsString(tx_id, paymentId, tx_key,tx_note, destinations, rings) {
-        var trStart = '<tr><td width="85" style="padding-top:5px"><b>',
-            trMiddle = '</b></td><td style="padding-left:10px;padding-top:5px;">',
-            trEnd = "</td></tr>";
-
-        return '<table border="0">'
-            + (tx_id ? trStart + qsTr("Tx ID:") + trMiddle + tx_id + trEnd : "")
-            + (paymentId ? trStart + qsTr("Payment ID:") + trMiddle + paymentId  + trEnd : "")
-            + (tx_key ? trStart + qsTr("Tx key:") + trMiddle + tx_key + trEnd : "")
-            + (tx_note ? trStart + qsTr("Tx note:") + trMiddle + tx_note  + trEnd : "")
-            + (destinations ? trStart + qsTr("Destinations:") + trMiddle + destinations + trEnd : "")
-            + (rings ? trStart + qsTr("Rings:") + trMiddle + rings + trEnd : "")
-            + "</table>"
-            + translationManager.emptyString;
-    }
-
-    function lookupPaymentID(paymentId) {
-        if (!addressBookModel)
-            return ""
-        var idx = addressBookModel.lookupPaymentID(paymentId)
-        if (idx < 0)
-            return ""
-        idx = addressBookModel.index(idx, 0)
-        return addressBookModel.data(idx, AddressBookModel.AddressBookDescriptionRole)
-    }
-
-
-    footer: Rectangle {
-        height: 127 * scaleRatio
-        width: listView.width
-        color: "transparent"
-
-        Text {
-            anchors.centerIn: parent
-            font.family: "Arial"
-            font.pixelSize: 14 * scaleRatio
-            color: "#545454"
-            text: qsTr("No more results") + translationManager.emptyString
-        }
-    }
-
-    delegate: Rectangle {
-        id: delegate
-        height: tableContent.height + 20 * scaleRatio
-        width: listView.width
-        color: "transparent"
-        Layout.leftMargin: 10 * scaleRatio
-        z: listView.count - index
-        function collapseDropdown() { dropdown.expanded = false }
-
-        Rectangle{
-            anchors.left: parent.left
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            width: 1
-            color: "#404040"
-        }
-
-        Rectangle{
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            anchors.top: parent.top
-            width: 1
-            color: "#404040"
-        }
-
-        Rectangle{
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            height: 1
-            color: "#404040"
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                var tx_key = currentWallet.getTxKey(hash)
-                var tx_note = currentWallet.getUserNote(hash)
-                var rings = currentWallet.getRings(hash)
-                if (rings)
-                    rings = rings.replace(/\|/g, '\n')
-                informationPopup.title = "Transaction details";
-                informationPopup.text = buildTxDetailsString(hash,paymentId,tx_key,tx_note,destinations, rings);
-                informationPopup.open();
-                informationPopup.onCloseCallback = null
-            }
-        }
-
-        Rectangle {
-            anchors.right: parent.right
-            anchors.rightMargin: 15 * scaleRatio
-            anchors.top: parent.top
-            anchors.topMargin: parent.height/2 - this.height/2
-            width: 30 * scaleRatio; height: 30 * scaleRatio
-            radius: 25
-            color: "#404040"
-
-            Image {
-                width: 20 * scaleRatio
-                height: 20 * scaleRatio
-                fillMode: Image.PreserveAspectFit
-                anchors.centerIn: parent
-                source: "qrc:///images/nextPage.png"
-            }
-        }
-
-        ColumnLayout {
-            id: tableContent
-            // Date
-            RowLayout {
-                Layout.topMargin: 20 * scaleRatio
-                Layout.leftMargin: 10 * scaleRatio
-                Text {
-                    font.family: MoneroComponents.Style.fontMedium.name
-                    font.pixelSize: 14 * scaleRatio
-                    color: MoneroComponents.Style.defaultFontColor
-                    text: date
-                }
-
-                Text {
-                    font.family: Style.fontRegular.name
-                    font.pixelSize: 14 * scaleRatio
-                    color: MoneroComponents.Style.dimmedFontColor
-                    text: time
-                }
-
-                // Show confirmations
-                Text {
-                    visible: confirmations < confirmationsRequired || isPending
-                    Layout.leftMargin: 5 * scaleRatio
-                    font.family: MoneroComponents.Style.fontRegular.name
-                    font.pixelSize: 14 * scaleRatio
-                    color:  (confirmations < confirmationsRequired)? "#FF6C3C" : "#545454"
-                    text: {
-                        if (!isPending)
-                            if(confirmations < confirmationsRequired)
-                                return qsTr("(%1/%2 confirmations)").arg(confirmations).arg(confirmationsRequired)
-                        if (!isOut)
-                            return qsTr("UNCONFIRMED") + translationManager.emptyString
-                        if (isFailed)
-                            return qsTr("FAILED") + translationManager.emptyString
-                        return qsTr("PENDING") + translationManager.emptyString
-
-                    }
-                }
-            }
-
-            // Amount & confirmations
-            RowLayout {
-                Layout.leftMargin: 10 * scaleRatio
-                spacing: 2
-                Text {
-                    font.family: "Arial"
-                    font.pixelSize: 14 * scaleRatio
-                    color: isOut ? MoneroComponents.Style.defaultFontColor : "#2eb358"
-                    text: isOut ? "↓" : "↑"
-                }
-
-                Text {
-                    id: amountText
-                    font.family: "Arial"
-                    font.pixelSize: 18 * scaleRatio
-                    color: isOut ? MoneroComponents.Style.defaultFontColor : "#2eb358"
-                    text:  displayAmount
-                }
-            }
-        }
-    }
-
-    ListModel {
-        id: dropModel
-        ListElement { name: "<b>Copy address to clipboard</b>"; icon: "../images/dropdownCopy.png" }
-        ListElement { name: "<b>Add to address book</b>"; icon: "../images/dropdownAdd.png" }
-        ListElement { name: "<b>Send to this address</b>"; icon: "../images/dropdownSend.png" }
-        ListElement { name: "<b>Find similar transactions</b>"; icon: "../images/dropdownSearch.png" }
-    }
-
-    Clipboard { id: clipboard }
-}

components/IconButton.qml

@@ -26,49 +26,33 @@
 // 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 "../components" as MoneroComponents
+import "../components/effects" as MoneroEffects
 
-import QtQuick 2.0
-
-Item {
-    property alias image : buttonImage
-    property alias imageSource : buttonImage.source
+MoneroEffects.ImageMask {
+    id: button
+    z: 666
+    color: MoneroComponents.Style.defaultFontColor
+    image: ""
 
     signal clicked(var mouse)
 
-
-    id: button
-    width: parent.height
-    height: parent.height
-    anchors.right: parent.right
-    anchors.top: parent.top
-    anchors.bottom: parent.bottom
-
-    Image {
-        id: buttonImage
-        source: ""
-        x : (parent.width - width) / 2
-        y : (parent.height - height)  /2
-        z: 100
-    }
-
     MouseArea {
-        id: buttonArea
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: Qt.PointingHandCursor
 
-        onPressed: {
-            buttonImage.x = buttonImage.x + 2
-            buttonImage.y = buttonImage.y + 2
-        }
-        onReleased: {
-            buttonImage.x = buttonImage.x - 2
-            buttonImage.y = buttonImage.y - 2
+        onEntered: {
+            button.width = button.width + 2
+            button.height = button.height + 2
         }
 
-        onClicked: {
-            parent.clicked(mouse)
+        onExited: {
+            button.width = button.width - 2
+            button.height = button.height - 2
         }
+
+        onClicked: button.clicked(mouse)
     }
-
 }

components/InlineButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
@@ -26,22 +26,34 @@
 // 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.0
+import QtQuick 2.9
 import QtQuick.Layouts 1.1
+import QtGraphicalEffects 1.0
 
-import "../components" as MoneroComponents
+import "." as MoneroComponents
+import "./effects/" as MoneroEffects
 
 Item {
     id: inlineButton
-    height: rect.height * scaleRatio
+    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: "#FFFFFF"
-    property int fontSize: 12 * scaleRatio
+    property string textColor: MoneroComponents.Style.inlineButtonTextColor
+    property int fontSize: small ? 14 : 16
+    property int rectHeight: small ? 24 : 24
+    property int rectHMargin: small ? 16 : 22
     property alias text: inlineText.text
+    property alias fontPixelSize: inlineText.font.pixelSize
+    property alias fontFamily: inlineText.font.family
+    property alias buttonColor: rect.color
+    property alias buttonHeight: rect.height
     signal clicked()
 
     function doClick() {
@@ -52,23 +64,37 @@ Item {
 
     Rectangle{
         id: rect
-        color: MoneroComponents.Style.buttonBackgroundColorDisabled
-        border.color: "black"
-        height: 28 * scaleRatio
-        width: inlineText.width + 22 * scaleRatio
+        color: MoneroComponents.Style.buttonInlineBackgroundColor
+        height: 24
+        width: inlineText.text ? (inlineText.width + 16) : inlineButton.icon ? (inlineImage.width + 16) : rect.height
         radius: 4
 
-        anchors.top: parent.top
+        anchors.verticalCenter: parent.verticalCenter
         anchors.right: parent.right
+        anchors.rightMargin: 4
 
-        Text {
+        MoneroComponents.TextPlain {
             id: inlineText
             font.family: MoneroComponents.Style.fontBold.name
             font.bold: true
-            font.pixelSize: 16 * scaleRatio
-            color: "black"
+            font.pixelSize: inlineButton.fontSize
+            color: inlineButton.textColor
             anchors.verticalCenter: parent.verticalCenter
             anchors.horizontalCenter: parent.horizontalCenter
+            themeTransition: false
+
+            MoneroEffects.ColorTransition {
+                targetObj: inlineText
+                blackColor: MoneroComponents.Style._b_inlineButtonTextColor
+                whiteColor: MoneroComponents.Style._w_inlineButtonTextColor
+            }
+        }
+
+        Image {
+            id: inlineImage
+            visible: inlineButton.icon !== ""
+            anchors.centerIn: parent
+            source: inlineButton.icon
         }
 
         MouseArea {
@@ -78,16 +104,30 @@ Item {
             anchors.fill: parent
             onClicked: doClick()
             onEntered: {
-                rect.color = "#707070";
+                rect.color = buttonColor ? buttonColor : "#707070";
                 rect.opacity = 0.8;
             }
             onExited: {
                 rect.opacity = 1.0;
-                rect.color = "#808080";
+                rect.color = buttonColor ? buttonColor : "#808080";
             }
         }
     }
 
+    DropShadow {
+        visible: !MoneroComponents.Style.blackTheme
+        anchors.fill: rect
+        horizontalOffset: 2
+        verticalOffset: 2
+        radius: 7.0
+        samples: 10
+        color: "#1B000000"
+        cached: true
+        source: rect
+    }
+
+    Keys.enabled: inlineButton.visible
     Keys.onSpacePressed: doClick()
+    Keys.onEnterPressed: Keys.onReturnPressed(event)
     Keys.onReturnPressed: doClick()
 }

components/Input.qml

@@ -27,21 +27,30 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import QtQuick.Controls 2.0
-import QtQuick 2.7
+import QtQuick 2.9
 
 import "../components" as MoneroComponents
 
 TextField {
+    id: textField
     font.family: MoneroComponents.Style.fontRegular.name
-    font.pixelSize: 18 * scaleRatio
+    font.pixelSize: 18
     font.bold: true
     horizontalAlignment: TextInput.AlignLeft
     selectByMouse: true
     color: MoneroComponents.Style.defaultFontColor
-    selectionColor: MoneroComponents.Style.dimmedFontColor
-    selectedTextColor: MoneroComponents.Style.defaultFontColor
+    selectionColor: MoneroComponents.Style.textSelectionColor
+    selectedTextColor: MoneroComponents.Style.textSelectedColor
 
     background: Rectangle {
         color: "transparent"
     }
+
+    MoneroComponents.ContextMenu {
+        cursorShape: Qt.IBeamCursor
+        onPaste: {
+            textField.clear();
+            textField.paste();
+        }
+    }
 }

components/InputDialog.qml

@@ -26,7 +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 QtQuick 2.7
+import QtQuick 2.9
 import QtQuick.Controls 2.0
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
@@ -45,27 +45,24 @@ Item {
     signal accepted()
     signal rejected()
 
-    function open() {
-        inactiveOverlay.visible = true
+    function open(prepopulate) {
         leftPanel.enabled = false
         middlePanel.enabled = false
-        titleBar.enabled = false
-        show()
+        titleBar.state = "essentials"
         root.visible = true;
         input.focus = true;
-        input.text = "";
+        input.text = prepopulate ? prepopulate : "";
     }
 
     function close() {
-        inactiveOverlay.visible = false
         leftPanel.enabled = true
         middlePanel.enabled = true
-        titleBar.enabled = true
+        titleBar.state = "default"
         root.visible = false;
     }
 
     ColumnLayout {
-        z: bg.z + 1
+        z: parent.z + 1
         id: mainLayout
         spacing: 10
         anchors { fill: parent; margins: 35 }
@@ -75,42 +72,44 @@ Item {
 
             Layout.fillWidth: true
             Layout.alignment: Qt.AlignHCenter
-            Layout.maximumWidth: 400 * scaleRatio
+            Layout.maximumWidth: 400
 
             Label {
                 id: label
-                anchors.left: parent.left
                 Layout.fillWidth: true
 
-                font.pixelSize: 16 * scaleRatio
+                font.pixelSize: 16
                 font.family: MoneroComponents.Style.fontLight.name
 
                 color: MoneroComponents.Style.defaultFontColor
             }
 
-            TextField {
+            MoneroComponents.Input {
                 id : input
                 focus: true
                 Layout.topMargin: 6
                 Layout.fillWidth: true
-                anchors.left: parent.left
                 horizontalAlignment: TextInput.AlignLeft
                 verticalAlignment: TextInput.AlignVCenter
                 font.family: MoneroComponents.Style.fontLight.name
-                font.pixelSize: 24 * scaleRatio
+                font.pixelSize: 24
                 KeyNavigation.tab: okButton
                 bottomPadding: 10
                 leftPadding: 10
                 topPadding: 10
                 color: MoneroComponents.Style.defaultFontColor
+                selectionColor: MoneroComponents.Style.textSelectionColor
+                selectedTextColor: MoneroComponents.Style.textSelectedColor
 
                 background: Rectangle {
                     radius: 2
-                    border.color: Qt.rgba(255, 255, 255, 0.35)
+                    border.color: MoneroComponents.Style.inputBorderColorActive
                     border.width: 1
-                    color: "black"
+                    color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
                 }
 
+                Keys.enabled: root.visible
+                Keys.onEnterPressed: Keys.onReturnPressed(event)
                 Keys.onReturnPressed: {
                     root.close()
                     root.accepted()
@@ -124,7 +123,7 @@ Item {
             // Ok/Cancel buttons
             RowLayout {
                 id: buttons
-                spacing: 16 * scaleRatio
+                spacing: 16
                 Layout.topMargin: 16
                 Layout.alignment: Qt.AlignRight
 
@@ -145,7 +144,7 @@ Item {
                     small: true
                     width: 120
                     fontSize: 14
-                    text: qsTr("Ok")
+                    text: qsTr("Ok") + translationManager.emptyString
                     KeyNavigation.tab: cancelButton
                     onClicked: {
                         root.close()

components/InputMulti.qml

@@ -27,44 +27,53 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import QtQuick.Controls 2.0
-import QtQuick 2.7
+import QtQuick 2.9
 
 import "../js/TxUtils.js" as TxUtils
 import "../components" as MoneroComponents
 
-
 TextArea {
+    property int fontSize: 18
+    property bool fontBold: false
+    property string fontColor: MoneroComponents.Style.defaultFontColor
+
+    property bool mouseSelection: true
     property bool error: false
     property bool addressValidation: false
-    property bool wrapAnywhere: true
-    property int fontSize: 18 * scaleRatio
-    property bool fontBold: false
 
     id: textArea
     font.family: MoneroComponents.Style.fontRegular.name
+    color: fontColor
     font.pixelSize: fontSize
     font.bold: fontBold
     horizontalAlignment: TextInput.AlignLeft
-    selectByMouse: true
-    color: MoneroComponents.Style.defaultFontColor
-    selectionColor: MoneroComponents.Style.dimmedFontColor
-    selectedTextColor: MoneroComponents.Style.defaultFontColor
+    selectByMouse: mouseSelection
+    selectionColor: MoneroComponents.Style.textSelectionColor
+    selectedTextColor: MoneroComponents.Style.textSelectedColor
+
+    property int minimumHeight: 100
+    height: contentHeight > minimumHeight ? contentHeight : minimumHeight
 
-    wrapMode: {
-        if(wrapAnywhere){
-            return Text.WrapAnywhere;
-        } else {
-            return Text.WordWrap;
-        }
-    }
     onTextChanged: {
         if(addressValidation){
             // js replacement for `RegExpValidator { regExp: /[0-9A-Fa-f]{95}/g }`
-            textArea.text = textArea.text.replace(/[^a-z0-9.@]/gi,'');
-            var address_ok = TxUtils.checkAddress(textArea.text, appWindow.persistentSettings.nettype);
+            if (textArea.text.startsWith("monero:")) {
+                error = false;
+                return;
+            }
+            textArea.text = textArea.text.replace(/[^a-z0-9.@\-]/gi,'');
+            var address_ok = TxUtils.checkAddress(textArea.text, appWindow.persistentSettings.nettype) || TxUtils.isValidOpenAliasAddress(textArea.text);
             if(!address_ok) error = true;
             else error = false;
             TextArea.cursorPosition = textArea.text.length;
         }
     }
+
+    MoneroComponents.ContextMenu {
+        cursorShape: Qt.IBeamCursor
+        onPaste: {
+            textArea.clear();
+            textArea.paste();
+        }
+    }
 }

components/Label.qml

@@ -26,7 +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 QtQuick 2.5
+import QtQuick 2.9
 import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
@@ -35,24 +35,27 @@ Item {
     id: item
     property alias text: label.text
     property alias color: label.color
-    property alias textFormat: label.textFormat
+    property int textFormat: Text.PlainText
     property string tipText: ""
-    property int fontSize: 16 * scaleRatio
+    property int fontSize: 16
     property bool fontBold: false
     property string fontColor: MoneroComponents.Style.defaultFontColor
     property string fontFamily: ""
     property alias wrapMode: label.wrapMode
     property alias horizontalAlignment: label.horizontalAlignment
-    property alias hoveredLink: label.hoveredLink
+    property alias elide: label.elide
+    property alias textWidth: label.width
+    property alias styleName: label.font.styleName
+    property alias themeTransition: label.themeTransition
     signal linkActivated()
-    height: label.height * scaleRatio
-    width: label.width * scaleRatio
-    Layout.topMargin: 10 * scaleRatio
+    height: label.height
+    width: label.width
+    Layout.topMargin: 10
 
-    Text {
+    MoneroComponents.TextPlain {
         id: label
         anchors.bottom: parent.bottom
-        anchors.bottomMargin: 2 * scaleRatio
+        anchors.bottomMargin: 2
         anchors.left: parent.left
         font.family: {
             if(fontFamily){
@@ -65,5 +68,11 @@ Item {
         font.bold: fontBold
         color: fontColor
         onLinkActivated: item.linkActivated()
+        textFormat: parent.textFormat
+        MouseArea {
+            anchors.fill: parent
+            acceptedButtons: Qt.NoButton
+            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+        }
     }
 }

components/LabelButton.qml

@@ -26,7 +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 QtQuick 2.0
+import QtQuick 2.9
 import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
@@ -37,14 +37,14 @@ Rectangle {
     property alias text: labelButtonText.text
 
     id: labelButton
-    color: "#808080"
+    color: MoneroComponents.Style.buttonBackgroundColorDisabled
     radius: 3
     height: 20
     width: labelButtonText.width + 14
     anchors.right: copyButton.left
     anchors.rightMargin: 6
 
-    Text {
+    MoneroComponents.TextPlain {
         id: labelButtonText
         anchors.verticalCenter: parent.verticalCenter
         anchors.horizontalCenter: parent.horizontalCenter
@@ -52,7 +52,7 @@ Rectangle {
         font.pixelSize: 12
         font.bold: true
         text: ""
-        color: "black"
+        color: MoneroComponents.Style.inlineButtonTextColor
     }
 
     MouseArea {
@@ -61,11 +61,11 @@ Rectangle {
         hoverEnabled: true
         onClicked: labelButton.clicked()
         onEntered: {
-            labelButton.color = "#707070";
+            labelButton.color = MoneroComponents.Style.buttonBackgroundColorDisabledHover;
             labelButtonText.opacity = 0.8;
         }
         onExited: {
-            labelButton.color = "#808080";
+            labelButton.color = MoneroComponents.Style.buttonBackgroundColorDisabled;
             labelButtonText.opacity = 1.0;
         }
     }

components/LabelSubheader.qml

@@ -26,13 +26,14 @@
 // 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.0
+import QtQuick 2.9
 
 import "../components" as MoneroComponents
+import "../components/effects/" as MoneroEffects
 
 Label {
     id: item
-    fontSize: 18 * scaleRatio
+    fontSize: 18
 
     Rectangle {
         anchors.top: item.bottom
@@ -40,13 +41,12 @@ Label {
         anchors.left: parent.left
         anchors.right: parent.right
         height: 2
-        color: MoneroComponents.Style.dividerColor
-        opacity: MoneroComponents.Style.dividerOpacity
-    }
+        color: MoneroComponents.Style.appWindowBorderColor
 
-    MouseArea {
-        anchors.fill: parent
-        acceptedButtons: Qt.NoButton
-        cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+        MoneroEffects.ColorTransition {
+            targetObj: parent
+            blackColor: MoneroComponents.Style._b_appWindowBorderColor
+            whiteColor: MoneroComponents.Style._w_appWindowBorderColor
+        }
     }
 }

components/LanguageButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2020, The Monero Project
 //
 // All rights reserved.
 //
@@ -26,43 +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.
 
-import QtQuick 2.0
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.1
+import QtQuick 2.9
+import QtQuick.Layouts 1.3
 
-ColumnLayout {
-    property alias password: password.text
-    property alias placeholderText: password.placeholderText
-    signal changed(string password)
+import FontAwesome 1.0
 
+import "../components" as MoneroComponents
 
-    TextField {
-        Layout.fillWidth: true
-        id : password
-        focus:true
-        font.family: "Arial"
-        font.pixelSize: (isMobile) ? 25 * scaleRatio : 26 * scaleRatio
-        echoMode: TextInput.Password
-        style: TextFieldStyle {
-            renderType: Text.NativeRendering
-            textColor: "#35B05A"
-            passwordCharacter: "•"
-            background: Rectangle {
-                radius: 0
-                border.width: 0
-            }
+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
         }
-        onTextChanged: changed(text)
 
-        Keys.onReleased: {
-            changed(text)
+        MoneroComponents.TextPlain {
+            font.pixelSize: 14
+            text: persistentSettings.language
         }
     }
 
-    Rectangle {
-        Layout.fillWidth:true
-        height: 1
-        color: "#DBDBDB"
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+        onClicked: appWindow.toggleLanguageView()
     }
 }

components/LanguageSidebar.qml

@@ -0,0 +1,180 @@
+// 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 "../components" as MoneroComponents
+
+import QtQuick 2.9
+import QtQuick.XmlListModel 2.0
+import QtQuick.Layouts 1.2
+import QtQuick.Controls 2.0
+
+
+Drawer {
+    id: sideBar
+
+    // @TODO: Qt 5.10 introduces `opened` built-in for Drawer
+    property bool isOpened: false
+
+    onClosed: {
+        isOpened = false;
+    }
+
+    onOpened: {
+        isOpened = true;
+    }
+
+    width: 240
+    height: parent.height - (persistentSettings.customDecorations ? 50 : 0)
+    y: titleBar.height
+
+    background: Rectangle {
+        color: MoneroComponents.Style.blackTheme ? "#0d0d0d" : "white"
+        width: parent.width
+    }
+
+    Rectangle {
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        color: "red"
+
+        ListView {
+            clip: true
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            boundsBehavior: Flickable.StopAtBounds
+            width: sideBar.width
+            height: sideBar.height
+
+            model: langModel
+
+            delegate: Rectangle {
+                id: item
+                color: "transparent"
+                width: sideBar.width
+                height: 32
+
+                Rectangle {
+                    id: flagRect
+                    height: 24
+                    width: 24
+                    anchors.left: parent.left
+                    anchors.leftMargin: 4
+                    anchors.verticalCenter: parent.verticalCenter
+                    color: "transparent"
+
+                    Image {
+                        anchors.fill: parent
+                        source: flag
+                    }
+                }
+
+                MoneroComponents.TextPlain {
+                    anchors.left: parent.left
+                    anchors.leftMargin: 30
+                    font.bold: true
+                    font.pixelSize: 14
+                    color: MoneroComponents.Style.defaultFontColor
+                    text: display_name
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                Rectangle {
+                    anchors.bottom: parent.bottom
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    color: MoneroComponents.Style.dividerColor
+                    opacity: MoneroComponents.Style.dividerOpacity
+                    height: 1
+                }
+
+                // button gradient while checked
+                Image {
+                    anchors.fill: parent
+                    source: "qrc:///images/menuButtonGradient.png"
+                    opacity: 0.65
+                    visible: true
+
+                    MouseArea {
+                        anchors.fill: parent
+                        cursorShape: Qt.PointingHandCursor
+                        onClicked: {
+                            var locale_spl = locale.split("_");
+
+                            // reload active translations
+                            console.log(locale_spl[0]);
+                            translationManager.setLanguage(locale_spl[0]);
+
+                            // set wizard language settings
+                            wizard.language_locale = locale;
+                            wizard.language_wallet = wallet_language;
+                            wizard.language_language = display_name;
+
+                            appWindow.showStatusMessage(qsTr("Language changed."), 3);
+                            appWindow.toggleLanguageView();
+                        }
+                        hoverEnabled: true
+                        onEntered: {
+                            // item.color = "#26FFFFFF"
+                            parent.opacity = 1
+                        }
+                        onExited: {
+                            // item.color = "transparent"
+                            parent.opacity = 0.65
+                        }
+                    }
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {
+                onActiveChanged: if (!active && !isMac) active = true
+            }
+        }
+    }
+
+    //Flags model
+    XmlListModel {
+        id: langModel
+        source: "/lang/languages.xml"
+        query: "/languages/language"
+
+        XmlRole { name: "display_name"; query: "@display_name/string()" }
+        XmlRole { name: "locale"; query: "@locale/string()" }
+        XmlRole { name: "wallet_language"; query: "@wallet_language/string()" }
+        XmlRole { name: "flag"; query: "@flag/string()" }
+        // TODO: XmlListModel is read only, we should store current language somewhere else
+        // and set current language accordingly
+        XmlRole { name: "isCurrent"; query: "@enabled/string()" }
+
+        onStatusChanged: {
+            if(status === XmlListModel.Ready){
+                console.log("languages available: ",count);
+            }
+        }
+    }
+}

components/LineEdit.qml

@@ -26,40 +26,52 @@
 // 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.0
+import FontAwesome 1.0
+import QtQuick 2.9
+import QtGraphicalEffects 1.0
 
 import "../components" as MoneroComponents
 
 Item {
     id: item
+    property alias input: input
     property alias text: input.text
 
+    property bool password: false
+    property bool passwordHidden: true
+    property var passwordLinked: null
+
     property alias placeholderText: placeholderLabel.text
     property bool placeholderCenter: false
     property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name
     property bool placeholderFontBold: false
-    property int placeholderFontSize: 18 * scaleRatio
+    property int placeholderFontSize: 18
     property string placeholderColor: MoneroComponents.Style.defaultFontColor
     property real placeholderOpacity: 0.35
 
+    property alias acceptableInput: input.acceptableInput
     property alias validator: input.validator
     property alias readOnly : input.readOnly
     property alias cursorPosition: input.cursorPosition
-    property alias echoMode: input.echoMode
     property alias inlineButton: inlineButtonId
     property alias inlineButtonText: inlineButtonId.text
     property alias inlineIcon: inlineIcon.visible
     property bool copyButton: false
+    property alias copyButtonText: copyButtonId.text
+    property alias copyButtonEnabled: copyButtonId.enabled
+
+    property bool borderDisabled: false
     property string borderColor: {
-        if(input.activeFocus){
+        if(error && input.text !== ""){
+            return MoneroComponents.Style.inputBorderColorInvalid;
+        } else if(input.activeFocus){
             return MoneroComponents.Style.inputBorderColorActive;
         } else {
             return MoneroComponents.Style.inputBorderColorInActive;
         }
     }
-    property bool borderDisabled: false
-    property int fontSize: 18 * scaleRatio
-    property bool showBorder: true
+
+    property int fontSize: 18
     property bool fontBold: false
     property alias fontColor: input.color
     property bool error: false
@@ -68,19 +80,19 @@ Item {
     property alias labelTextFormat: inputLabel.textFormat
     property string backgroundColor: "transparent"
     property string tipText: ""
-    property int labelFontSize: 16 * scaleRatio
+    property int labelFontSize: 16
     property bool labelFontBold: false
     property alias labelWrapMode: inputLabel.wrapMode
     property alias labelHorizontalAlignment: inputLabel.horizontalAlignment
     property bool showingHeader: inputLabel.text !== "" || copyButton
-    property int inputHeight: 42 * scaleRatio
+    property int inputHeight: 42
 
     signal labelLinkActivated(); // input label, rich text <a> signal
     signal editingFinished();
     signal accepted();
     signal textUpdated();
 
-    height: showingHeader ? (inputLabel.height + inputItem.height + 2) * scaleRatio : 42 * scaleRatio
+    height: showingHeader ? (inputLabel.height + inputItem.height + 2) : 42
 
     onTextUpdated: {
         // check to remove placeholder text when there is content
@@ -101,12 +113,36 @@ Item {
         }
     }
 
-    Text {
+    function isPasswordHidden() {
+        if (password) {
+            return passwordHidden;
+        }
+        if (passwordLinked) {
+            return passwordLinked.passwordHidden;
+        }
+        return false;
+    }
+
+    function reset() {
+        text = "";
+        if (!passwordLinked) {
+            passwordHidden = true;
+        }
+    }
+
+    function passwordToggle() {
+        if (passwordLinked) {
+            passwordLinked.passwordHidden = !passwordLinked.passwordHidden;
+        } else {
+            passwordHidden = !passwordHidden;
+        }
+    }
+
+    MoneroComponents.TextPlain {
         id: inputLabel
         anchors.top: parent.top
         anchors.left: parent.left
-        anchors.topMargin: 2 * scaleRatio
-        font.family: MoneroComponents.Style.fontLight.name
+        font.family: MoneroComponents.Style.fontRegular.name
         font.pixelSize: labelFontSize
         font.bold: labelFontBold
         textFormat: Text.RichText
@@ -122,7 +158,7 @@ Item {
 
     MoneroComponents.LabelButton {
         id: copyButtonId
-        text: qsTr("Copy")
+        text: qsTr("Copy") + translationManager.emptyString
         anchors.right: parent.right
         onClicked: {
             if (input.text.length > 0) {
@@ -136,12 +172,13 @@ Item {
 
     Item{
         id: inputItem
-        height: inputHeight * scaleRatio
+        height: inputHeight
         anchors.top: showingHeader ? inputLabel.bottom : parent.top
-        anchors.topMargin: showingHeader ? 12 * scaleRatio : 2 * scaleRatio
+        anchors.topMargin: showingHeader ? 12 : 2
         width: parent.width
+        clip: true
 
-        Text {
+        MoneroComponents.TextPlain {
             id: placeholderLabel
             visible: input.text ? false : true
             anchors.verticalCenter: parent.verticalCenter
@@ -151,14 +188,14 @@ Item {
                 if(placeholderCenter){
                     return undefined;
                 }
-                else if(inlineIcon.visible){ return 50 * scaleRatio; }
-                else { return 10 * scaleRatio; }
+                else if(inlineIcon.visible){ return 50; }
+                else { return 10; }
             }
 
             opacity: item.placeholderOpacity
             color: item.placeholderColor
             font.family: item.placeholderFontFamily
-            font.pixelSize: placeholderFontSize * scaleRatio
+            font.pixelSize: placeholderFontSize
             font.bold: item.placeholderFontBold
             text: ""
             z: 3
@@ -166,8 +203,8 @@ Item {
 
         Rectangle {
             anchors.fill: parent
-            anchors.topMargin: 1 * scaleRatio
-            color: "transparent"
+            anchors.topMargin: 1
+            color: item.enabled ? "transparent" : MoneroComponents.Style.inputBoxBackgroundDisabled
         }
 
         Rectangle {
@@ -181,34 +218,55 @@ Item {
 
         Image {
             id: inlineIcon
-            width: 26 * scaleRatio
-            height: 26 * scaleRatio
+            width: 26
+            height: 26
             anchors.top: parent.top
-            anchors.topMargin: 8 * scaleRatio
+            anchors.topMargin: 8
             anchors.left: parent.left
-            anchors.leftMargin: 12 * scaleRatio
-            source: "../images/moneroIcon-28x28.png"
+            anchors.leftMargin: 12
+            source: "qrc:///images/moneroIcon-28x28.png"
             visible: false
         }
 
         MoneroComponents.Input {
             id: input
             anchors.fill: parent
-            anchors.leftMargin: inlineIcon.visible ? 38 : 0
+            anchors.leftMargin: inlineIcon.visible ? 44 : 0
             font.pixelSize: item.fontSize
             font.bold: item.fontBold
             onEditingFinished: item.editingFinished()
             onAccepted: item.accepted();
             onTextChanged: item.textUpdated()
+            topPadding: 10
+            bottomPadding: 10
+            echoMode: isPasswordHidden() ? TextInput.Password : TextInput.Normal
+
+            MoneroComponents.Label {
+                visible: password || passwordLinked
+                fontSize: 20
+                text: isPasswordHidden() ? FontAwesome.eye : FontAwesome.eyeSlash
+                opacity: eyeMouseArea.containsMouse ? 0.9 : 0.7
+                fontFamily: FontAwesome.fontFamily
+                anchors.right: parent.right
+                anchors.rightMargin: 15
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.verticalCenterOffset: 1
+
+                MouseArea {
+                    id: eyeMouseArea
+                    anchors.fill: parent
+                    cursorShape: Qt.PointingHandCursor
+                    hoverEnabled: true
+                    onClicked: passwordToggle()
+                }
+            }
         }
 
         MoneroComponents.InlineButton {
             id: inlineButtonId
             visible: item.inlineButtonText ? true : false
             anchors.right: parent.right
-            anchors.rightMargin: 8 * scaleRatio
-            anchors.top: parent.top
-            anchors.topMargin: 6 * scaleRatio
+            anchors.rightMargin: 8
         }
     }
 }

components/LineEditMulti.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2015, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
@@ -26,96 +26,165 @@
 // 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.0
+import QtQuick 2.9
 import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
 
 ColumnLayout {
-    id: lineditmulti
-    property alias text: multiLine.text
-    property alias placeholderText: placeholderLabel.text
+    id: item
+
+    Layout.fillWidth: true
+
+    property alias text: input.text
     property alias labelText: inputLabel.text
-    property alias error: multiLine.error
-    property alias readOnly: multiLine.readOnly
-    property alias addressValidation: multiLine.addressValidation
     property alias labelButtonText: labelButton.text
+    property alias placeholderText: placeholderLabel.text
+
+    property int inputPaddingLeft: 10
+    property int inputPaddingRight: 10
+    property int inputPaddingTop: 10
+    property int inputPaddingBottom: 10
+    property int inputRadius: 4
+
+    property bool placeholderCenter: false
+    property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name
+    property bool placeholderFontBold: false
+    property int placeholderFontSize: 18
+    property string placeholderColor: MoneroComponents.Style.defaultFontColor
+    property real placeholderOpacity: 0.35
+
+    property bool borderDisabled: false
+    property string borderColor: {
+        if(input.error && input.text !== ""){
+            return MoneroComponents.Style.inputBorderColorInvalid;
+        } else if(input.activeFocus){
+            return MoneroComponents.Style.inputBorderColorActive;
+        } else {
+            return MoneroComponents.Style.inputBorderColorInActive;
+        }
+    }
+
+    property bool error: false
+
+    property string labelFontColor: MoneroComponents.Style.defaultFontColor
     property bool labelFontBold: false
+    property int labelFontSize: 16
     property bool labelButtonVisible: false
-    property bool copyButton: false
-    property bool wrapAnywhere: true
-    property bool showingHeader: true
-    property bool showBorder: true
+
+    property string fontColor: MoneroComponents.Style.defaultFontColor
     property bool fontBold: false
-    property int fontSize: 16 * scaleRatio
+    property int fontSize: 16
+
+    property bool mouseSelection: true
+    property alias readOnly: input.readOnly
+    property bool copyButton: false
+    property bool pasteButton: false
+    property bool showingHeader: labelText != "" || copyButton || pasteButton
+    property var wrapMode: Text.NoWrap
+    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();
 
     spacing: 0
     Rectangle {
         id: inputLabelRect
         color: "transparent"
         Layout.fillWidth: true
-        height: (inputLabel.height + 10) * scaleRatio
+        height: (inputLabel.height + 10)
         visible: showingHeader ? true : false
 
-        Text {
+        MoneroComponents.TextPlain {
             id: inputLabel
             anchors.top: parent.top
             anchors.left: parent.left
             font.family: MoneroComponents.Style.fontRegular.name
-            font.pixelSize: 16 * scaleRatio
+            font.pixelSize: item.labelFontSize
             font.bold: labelFontBold
             textFormat: Text.RichText
-            color: MoneroComponents.Style.defaultFontColor
+            color: item.labelFontColor
             onLinkActivated: inputLabelLinkActivated()
+
+            MouseArea {
+                anchors.fill: parent
+                acceptedButtons: Qt.NoButton
+                cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+            }
         }
 
-        MoneroComponents.LabelButton {
-            id: labelButton
-            onClicked: labelButtonClicked()
-            visible: labelButtonVisible
-        }
+        RowLayout {
+            anchors.right: parent.right
+            spacing: 16
 
-        MoneroComponents.LabelButton {
-            id: copyButtonId
-            visible: copyButton && multiLine.text !== ""
-            text: qsTr("Copy")
-            anchors.right: labelButton.visible ? inputLabel.right : parent.right
-            anchors.rightMargin: labelButton.visible? 4 : 0
-            onClicked: {
-                if (multiLine.text.length > 0) {
-                    console.log("Copied to clipboard");
-                    clipboard.setText(multiLine.text);
-                    appWindow.showStatusMessage(qsTr("Copied to clipboard"), 3);
+            MoneroComponents.LabelButton {
+                id: labelButton
+                onClicked: labelButtonClicked()
+                visible: labelButtonVisible
+            }
+
+            MoneroComponents.LabelButton {
+                id: copyButtonId
+                visible: copyButton && input.text !== ""
+                text: qsTr("Copy") + translationManager.emptyString
+                onClicked: {
+                    if (input.text.length > 0) {
+                        console.log("Copied to clipboard");
+                        clipboard.setText(input.text);
+                        appWindow.showStatusMessage(qsTr("Copied to clipboard"), 3);
+                    }
                 }
             }
+
+            MoneroComponents.LabelButton {
+                id: pasteButtonId
+                onClicked: {
+                    input.clear();
+                    input.paste();
+                }
+                text: qsTr("Paste") + translationManager.emptyString
+                visible: pasteButton
+            }
         }
     }
 
     MoneroComponents.InputMulti {
-        id: multiLine
+        id: input
         readOnly: false
-        addressValidation: true
-        anchors.top: parent.showingHeader ? inputLabelRect.bottom : parent.top
+        addressValidation: false
         Layout.fillWidth: true
-        topPadding: parent.showingHeader ? 10 * scaleRatio : 0
-        bottomPadding: 10 * scaleRatio
-        wrapAnywhere: parent.wrapAnywhere
-        fontSize: parent.fontSize
-        fontBold: parent.fontBold
+        
+        leftPadding: item.inputPaddingLeft
+        rightPadding: item.inputPaddingRight
+        topPadding: item.inputPaddingTop
+        bottomPadding: item.inputPaddingBottom
 
-        Text {
+        wrapMode: item.wrapMode
+        fontSize: item.fontSize
+        fontBold: item.fontBold
+        fontColor: item.fontColor
+        mouseSelection: item.mouseSelection
+        onEditingFinished: item.editingFinished()
+        error: item.error
+
+        MoneroComponents.TextPlain {
             id: placeholderLabel
-            visible: multiLine.text ? false : true
+            visible: input.text ? false : true
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
-            anchors.leftMargin: 10 * scaleRatio
-            opacity: 0.35
-            color: MoneroComponents.Style.defaultFontColor
-            font.family: MoneroComponents.Style.fontRegular.name
-            font.pixelSize: 18 * scaleRatio
+            anchors.leftMargin: 10
+            opacity: item.placeholderOpacity
+            color: item.placeholderColor
+            font.family: item.placeholderFontFamily
+            font.bold: item.placeholderFontBold
+            font.pixelSize: item.placeholderFontSize
             text: ""
             z: 3
         }
@@ -123,18 +192,24 @@ ColumnLayout {
         Rectangle {
             color: "transparent"
             border.width: 1
-            border.color: {
-              if(multiLine.error && multiLine.text !== ""){
-                  return MoneroComponents.Style.inputBorderColorInvalid;
-              } else if(multiLine.activeFocus){
-                  return MoneroComponents.Style.inputBorderColorActive;
-              } else {
-                  return MoneroComponents.Style.inputBorderColorInActive;
-              }
-            }
-            radius: 4
+            border.color: item.borderColor
+            radius: item.inputRadius
             anchors.fill: parent
-            visible: lineditmulti.showBorder
+            visible: !item.borderDisabled
+        }
+
+        MoneroComponents.InlineButton {
+            id: inlineButtonId
+            visible: (inlineButtonId.text || inlineButtonId.icon) && inlineButtonVisible ? true : false
+            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
         }
     }
 }

components/MenuButton.qml

@@ -26,15 +26,16 @@
 // 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.5
+import QtQuick 2.9
+import QtGraphicalEffects 1.0
 
 import "../components" as MoneroComponents
+import "effects/" as MoneroEffects
 
 Rectangle {
     id: button
     property alias text: label.text
     property bool checked: false
-    property alias dotColor: dot.color
     property alias symbol: symbolText.text
     property int numSelectedChildren: 0
     property var under: null
@@ -46,12 +47,11 @@ Rectangle {
         clicked();
     }
 
-
     function getOffset() {
         var offset = 0
         var item = button
         while (item.under) {
-            offset += 20 * scaleRatio
+            offset += 20
             item = item.under
         }
         return offset
@@ -59,77 +59,78 @@ Rectangle {
 
     color: "transparent"
     property bool present: !under || under.checked || checked || under.numSelectedChildren > 0
-    height: present ? ((appWindow.height >= 800) ? 44 * scaleRatio  : 38 * scaleRatio ) : 0
+    height: present ? ((appWindow.height >= 800) ? 44  : 38 ) : 0
 
-    // button gradient while checked
-    Image {
+    LinearGradient {
+        visible: isOpenGL && (button.checked || buttonArea.containsMouse)
         height: parent.height
         width: 260
         anchors.verticalCenter: parent.verticalCenter
         anchors.right: parent.right
         anchors.rightMargin: -20
         anchors.leftMargin: parent.getOffset()
-        source: "../images/menuButtonGradient.png"
-        visible: button.checked
+        start: Qt.point(width, 0)
+        end: Qt.point(0, 0)
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: MoneroComponents.Style.menuButtonGradientStart }
+            GradientStop { position: 1.0; color: MoneroComponents.Style.menuButtonGradientStop }
+        }
+        opacity: button.checked ? 1 : 0.3
+    }
+
+    // fallback hover effect when opengl is not available
+    Rectangle {
+        visible: !isOpenGL && (button.checked || buttonArea.containsMouse)
+        anchors.fill: parent
+        color: MoneroComponents.Style.menuButtonFallbackBackgroundColor
+        opacity: button.checked ? 1 : 0.3
     }
 
     // button decorations that are subject to leftMargin offsets
     Rectangle {
         anchors.left: parent.left
-        anchors.leftMargin: parent.getOffset() + 20 * scaleRatio
+        anchors.leftMargin: 20
         height: parent.height
-        width: button.checked ? 20: 10
-        color: "#00000000"
-
-        // dot if unchecked
-        Rectangle {
-            id: dot
-            anchors.centerIn: parent
-            width: button.checked ? 20 * scaleRatio : 8 * scaleRatio
-            height: button.checked ? 20 * scaleRatio : 8 * scaleRatio
-            radius: button.checked ? 20 * scaleRatio : 4 * scaleRatio
-            color: button.dotColor
-            // arrow if checked
-            Image {
-                anchors.centerIn: parent
-                anchors.left: parent.left
-                source: "../images/arrow-right-medium-white.png"
-                visible: button.checked
-            }
-        }
+        width: 2
+        color: button.checked ? MoneroComponents.Style.buttonBackgroundColor : "transparent"
 
         // button text
-        Text {
+        MoneroComponents.TextPlain {
             id: label
+            color: MoneroComponents.Style.menuButtonTextColor
+            themeTransitionBlackColor: MoneroComponents.Style._b_menuButtonTextColor
+            themeTransitionWhiteColor: MoneroComponents.Style._w_menuButtonTextColor
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.right
-            anchors.leftMargin: 8 * scaleRatio
-            font.family: MoneroComponents.Style.fontMedium.name
+            anchors.leftMargin: button.getOffset() + 8
             font.bold: true
-            font.pixelSize: 16 * scaleRatio
-            color: "#FFFFFF"
+            font.pixelSize: 14
         }
     }
 
     // menu button right arrow
-    Image {
+    MoneroEffects.ImageMask {
         anchors.verticalCenter: parent.verticalCenter
-        anchors.right: parent.right
-        anchors.rightMargin: 20 * scaleRatio
         anchors.leftMargin: parent.getOffset()
-        source: "../images/right.png"
-        opacity: button.checked ? 1.0 : 0.4
+        anchors.right: parent.right
+        anchors.rightMargin: 20
+        height: 14
+        width: 8
+        image: MoneroComponents.Style.menuButtonImageRightSource
+        color: button.checked ? MoneroComponents.Style.menuButtonImageRightColorActive : MoneroComponents.Style.menuButtonImageRightColor
+        opacity: button.checked ? 0.8 : 0.25
     }
 
-    Text {
+    MoneroComponents.TextPlain {
         id: symbolText
         anchors.right: parent.right
-        anchors.rightMargin: 44 * scaleRatio
+        anchors.rightMargin: 44
         anchors.verticalCenter: parent.verticalCenter
-        font.pixelSize: 12 * scaleRatio
+        font.pixelSize: 12
         font.bold: true
-        color: button.checked || buttonArea.containsMouse ? "#FFFFFF" : dot.color
+        color: MoneroComponents.Style.menuButtonTextColor
         visible: appWindow.ctrlPressed
+        themeTransition: false
     }
 
     MouseArea {

components/MenuButtonDivider.qml

@@ -0,0 +1,15 @@
+import QtQuick 2.9
+
+import "." as MoneroComponents
+import "effects/" as MoneroEffects
+
+Rectangle {
+    color: MoneroComponents.Style.appWindowBorderColor
+    height: 1
+
+    MoneroEffects.ColorTransition {
+        targetObj: parent
+        blackColor: MoneroComponents.Style._b_appWindowBorderColor
+        whiteColor: MoneroComponents.Style._w_appWindowBorderColor
+    }
+}

components/MobileHeader.qml

@@ -1,118 +0,0 @@
-import QtQuick 2.2
-import QtGraphicalEffects 1.0
-import QtQuick.Layouts 1.1
-
-import moneroComponents.Wallet 1.0
-import "../components" as MoneroComponents
-
-// BasicPanel header
-Rectangle {
-    id: header
-    anchors.leftMargin: 1
-    anchors.rightMargin: 1
-    Layout.fillWidth: true
-    Layout.preferredHeight: 64 * scaleRatio
-    color: "#FFFFFF"
-
-    Image {
-        id: logo
-        visible: appWindow.width > 460 * scaleRatio
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.verticalCenterOffset: -5
-        anchors.left: parent.left
-        anchors.leftMargin: 50 * scaleRatio
-        source: "../images/moneroLogo2.png"
-    }
-
-    Image {
-        id: icon
-        visible: !logo.visible
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.left: parent.left
-        anchors.leftMargin: 40 * scaleRatio 
-        source: "../images/moneroIcon.png"
-    }
-
-    Grid {
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.top: parent.top
-        anchors.right: parent.right
-        anchors.topMargin: 10 * scaleRatio
-        width: 256 * scaleRatio
-        columns: 3
-
-        Text {
-            id: balanceLabel
-            width: 116 * scaleRatio
-            height: 20 * scaleRatio
-            font.family: "Arial"
-            font.pixelSize: 12 * scaleRatio
-            font.letterSpacing: -1
-            elide: Text.ElideRight
-            horizontalAlignment: Text.AlignLeft
-            verticalAlignment: Text.AlignBottom
-            color: "#535353"
-            text: leftPanel.balanceLabelText + ":"
-        }
-
-        Text {
-            id: balanceText
-            width: 110 * scaleRatio
-            height: 20 * scaleRatio
-            font.family: "Arial"
-            font.pixelSize: 18 * scaleRatio
-            font.letterSpacing: -1
-            elide: Text.ElideRight
-            horizontalAlignment: Text.AlignLeft
-            verticalAlignment: Text.AlignBottom
-            color: "#000000"
-            text: leftPanel.balanceText
-        }
-
-        Item {
-            height: 20 * scaleRatio
-            width: 20 * scaleRatio
-
-            Image {
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.left: parent.left
-                source: "../images/lockIcon.png"
-            }
-        }
-
-        Text {
-            width: 116 * scaleRatio
-            height: 20 * scaleRatio
-            font.family: "Arial"
-            font.pixelSize: 12 * scaleRatio
-            font.letterSpacing: -1
-            elide: Text.ElideRight
-            horizontalAlignment: Text.AlignLeft
-            verticalAlignment: Text.AlignBottom
-            color: "#535353"
-            text: qsTr("Unlocked Balance:")
-        }
-
-        Text {
-            id: availableBalanceText
-            width: 110 * scaleRatio
-            height: 20 * scaleRatio
-            font.family: "Arial"
-            font.pixelSize: 14 * scaleRatio
-            font.letterSpacing: -1
-            elide: Text.ElideRight
-            horizontalAlignment: Text.AlignLeft
-            verticalAlignment: Text.AlignBottom
-            color: "#000000"
-            text: leftPanel.unlockedBalanceText
-        }
-    }
-
-    Rectangle {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        height: 1
-        color: "#DBDBDB"
-    }
-}

components/NetworkStatusItem.qml

@@ -26,9 +26,10 @@
 // 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.0
+import QtQuick 2.9
 import QtQuick.Layouts 1.1
 
+import FontAwesome 1.0
 import moneroComponents.Wallet 1.0
 import "../components" as MoneroComponents
 
@@ -38,28 +39,43 @@ Rectangle {
     property var connected: Wallet.ConnectionStatus_Disconnected
 
     function getConnectionStatusString(status) {
-        if (status == Wallet.ConnectionStatus_Connected) {
-            if(!appWindow.daemonSynced)
-                return qsTr("Synchronizing")
-            if(appWindow.remoteNodeConnected)
-                return qsTr("Remote node")
-            return qsTr("Connected")
+        switch (appWindow.daemonStartStopInProgress)
+        {
+            case 1:
+                return qsTr("Starting the node");
+            case 2:
+                return qsTr("Stopping the node");
+            default:
+                break;
+        }
+        switch (status) {
+            case Wallet.ConnectionStatus_Connected:
+                if (!appWindow.daemonSynced)
+                    return qsTr("Synchronizing");
+                if (persistentSettings.useRemoteNode)
+                    return qsTr("Remote node");
+                return appWindow.isMining ? qsTr("Connected") + " + " + qsTr("Mining"): qsTr("Connected");
+            case Wallet.ConnectionStatus_WrongVersion:
+                return qsTr("Wrong version");
+            case Wallet.ConnectionStatus_Disconnected:
+                if (appWindow.walletMode <= 1) {
+                    return qsTr("Searching node") + translationManager.emptyString;
+                }
+                return qsTr("Disconnected");
+            case Wallet.ConnectionStatus_Connecting:
+                return qsTr("Connecting");
+            default:
+                return qsTr("Invalid connection status");
         }
-        if (status == Wallet.ConnectionStatus_WrongVersion)
-            return qsTr("Wrong version")
-        if (status == Wallet.ConnectionStatus_Disconnected)
-            return qsTr("Disconnected")
-        return qsTr("Invalid connection status")
     }
 
     RowLayout {
-        Layout.preferredHeight: 40 * scaleRatio
+        Layout.preferredHeight: 40
 
         Item {
             id: iconItem
-            anchors.top: parent.top
-            width: 40 * scaleRatio
-            height: 40 * scaleRatio
+            width: 40
+            height: 40
             opacity: {
                 if(item.connected == Wallet.ConnectionStatus_Connected){
                     return 1
@@ -70,50 +86,122 @@ Rectangle {
 
             Image {
                 anchors.top: parent.top
-                anchors.topMargin: 6
+                anchors.topMargin: !appWindow.isMining ? 6 : 4
                 anchors.right: parent.right
-                anchors.rightMargin: 11
+                anchors.rightMargin: !appWindow.isMining ? 11 : 0
                 source: {
-                    if(item.connected == Wallet.ConnectionStatus_Connected){
-                        return "../images/lightning.png"
+                    if(appWindow.isMining) {
+                       return "qrc:///images/miningxmr.png"
+                    } else if(item.connected == Wallet.ConnectionStatus_Connected) {
+                        return "qrc:///images/lightning.png"
                     } else {
-                        return "../images/lightning-white.png"
+                        return "qrc:///images/lightning-white.png"
+                    }
+                }
+                MouseArea {
+                    anchors.fill: parent
+                    visible: appWindow.walletMode >= 2
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: {
+                        if(!appWindow.isMining) {
+                            middlePanel.settingsView.settingsStateViewState = "Node";
+                            appWindow.showPageRequest("Settings");
+                        } else {
+                            appWindow.showPageRequest("Mining")
+                        }
                     }
                 }
             }
         }
 
         Item {
-            anchors.top: parent.top
-            anchors.left: iconItem.right
-            height: 40 * scaleRatio
-            width: 260 * scaleRatio
+            height: 40
+            width: 260
 
-            Text {
+            MoneroComponents.TextPlain {
                 id: statusText
                 anchors.left: parent.left
                 anchors.top: parent.top
                 anchors.topMargin: 0
                 font.family: MoneroComponents.Style.fontMedium.name
                 font.bold: true
-                font.pixelSize: 13 * scaleRatio
-                color: "white"
-                opacity: 0.5
+                font.pixelSize: 13
+                color: MoneroComponents.Style.dimmedFontColor
+                opacity: MoneroComponents.Style.blackTheme ? 0.65 : 0.5
                 text: qsTr("Network status") + translationManager.emptyString
+                themeTransition: false
             }
 
-            Text {
+            MoneroComponents.TextPlain {
                 id: statusTextVal
                 anchors.left: parent.left
                 anchors.top: parent.top
                 anchors.topMargin: 14
                 font.family: MoneroComponents.Style.fontMedium.name
-                font.pixelSize: 20 * scaleRatio
-                color: "white"
+                font.pixelSize: 20
+                color: MoneroComponents.Style.defaultFontColor
                 text: getConnectionStatusString(item.connected) + translationManager.emptyString
+                opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.7
+                themeTransition: false
+
+                MouseArea {
+                    anchors.fill: parent
+                    visible: appWindow.walletMode >= 2
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: {
+                        if(!appWindow.isMining) {
+                            middlePanel.settingsView.settingsStateViewState = "Node";
+                            appWindow.showPageRequest("Settings");
+                        } else {
+                            appWindow.showPageRequest("Mining")
+                        }
+                    }
+                }
+            }
+
+            Text {
+                anchors.left: statusTextVal.right
+                anchors.leftMargin: 16
+                anchors.verticalCenter: parent.verticalCenter
+                color: refreshMouseArea.containsMouse ?  MoneroComponents.Style.dimmedFontColor : MoneroComponents.Style.defaultFontColor
+                font.family: FontAwesome.fontFamilySolid
+                font.pixelSize: 24
+                font.styleName: "Solid"
+                opacity: iconItem.opacity * (refreshMouseArea.visible ? 1 : 0.5)
+                text: FontAwesome.random
+                visible: (
+                    !appWindow.disconnected &&
+                    !persistentSettings.useRemoteNode &&
+                    (persistentSettings.bootstrapNodeAddress == "auto" || persistentSettings.walletMode < 2)
+                )
+
+                MouseArea {
+                    id: refreshMouseArea
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    cursorShape: Qt.PointingHandCursor
+                    visible: true
+                    onClicked: {
+                        const callback = function(result) {
+                            refreshMouseArea.visible = true;
+                            if (result) {
+                                appWindow.showStatusMessage(qsTr("Successfully switched to another public node"), 3);
+                                appWindow.currentWallet.refreshHeightAsync();
+                            } else {
+                                appWindow.showStatusMessage(qsTr("Failed to switch public node"), 3);
+                            }
+                        };
+
+                        daemonManager.sendCommandAsync(
+                            ["set_bootstrap_daemon", "auto"],
+                            appWindow.currentWallet.nettype,
+                            callback);
+
+                        refreshMouseArea.visible = false;
+                        appWindow.showStatusMessage(qsTr("Switching to another public node"), 3);
+                    }
+                }
             }
         }
     }
-
-
 }

components/NewPasswordDialog.qml

@@ -1,248 +0,0 @@
-// Copyright (c) 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.
-
-import QtQuick 2.7
-import QtQuick.Controls 2.0
-import QtQuick.Dialogs 1.2
-import QtQuick.Layouts 1.1
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Window 2.0
-
-import "../components" as MoneroComponents
-
-Item {
-    id: root
-    visible: false
-    z: parent.z + 2
-
-    property alias password: passwordInput1.text
-
-    // same signals as Dialog has
-    signal accepted()
-    signal rejected()
-    signal closeCallback()
-
-    function open() {
-        inactiveOverlay.visible = true
-        leftPanel.enabled = false
-        middlePanel.enabled = false
-        titleBar.enabled = false
-        show();
-        root.visible = true;
-        passwordInput1.text = "";
-        passwordInput2.text = "";
-        passwordInput1.focus = true
-    }
-
-    function close() {
-        inactiveOverlay.visible = false
-        leftPanel.enabled = true
-        middlePanel.enabled = true
-        titleBar.enabled = true
-        root.visible = false;
-        closeCallback();
-    }
-
-    // TODO: implement without hardcoding sizes
-    width: 480
-    height: 360
-
-    // Make window draggable
-    MouseArea {
-        anchors.fill: parent
-        property point lastMousePos: Qt.point(0, 0)
-        onPressed: { lastMousePos = Qt.point(mouseX, mouseY); }
-        onMouseXChanged: root.x += (mouseX - lastMousePos.x)
-        onMouseYChanged: root.y += (mouseY - lastMousePos.y)
-    }
-
-    ColumnLayout {
-        z: inactiveOverlay.z + 1
-        id: mainLayout
-        spacing: 10
-        anchors { fill: parent; margins: 35 * scaleRatio }
-
-        ColumnLayout {
-            id: column
-
-            Layout.fillWidth: true
-            Layout.alignment: Qt.AlignHCenter
-            Layout.maximumWidth: 400 * scaleRatio
-
-            Label {
-                text: qsTr("Please enter new password")
-                anchors.left: parent.left
-                Layout.fillWidth: true
-
-                font.pixelSize: 16 * scaleRatio
-                font.family: MoneroComponents.Style.fontLight.name
-
-                color: MoneroComponents.Style.defaultFontColor
-            }
-
-            TextField {
-                id : passwordInput1
-                Layout.topMargin: 6
-                Layout.fillWidth: true
-                anchors.left: parent.left
-                horizontalAlignment: TextInput.AlignLeft
-                verticalAlignment: TextInput.AlignVCenter
-                font.family: MoneroComponents.Style.fontLight.name
-                font.pixelSize: 24 * scaleRatio
-                echoMode: TextInput.Password
-                bottomPadding: 10
-                leftPadding: 10
-                topPadding: 10
-                color: MoneroComponents.Style.defaultFontColor
-                KeyNavigation.tab: passwordInput2
-
-                background: Rectangle {
-                    radius: 2
-                    border.color: Qt.rgba(255, 255, 255, 0.35)
-                    border.width: 1
-                    color: "black"
-
-                    Image {
-                        width: 12
-                        height: 16
-                        source: "../images/lockIcon.png"
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.right: parent.right
-                        anchors.rightMargin: 20
-                    }
-                }
-
-                Keys.onEscapePressed: {
-                    root.close()
-                    root.rejected()
-                }
-            }
-
-            // padding
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.alignment: Qt.AlignHCenter
-                height: 10
-                opacity: 0
-                color: "black"
-            }
-
-            Label {
-                text: qsTr("Please confirm new password")
-                anchors.left: parent.left
-                Layout.fillWidth: true
-
-                font.pixelSize: 16 * scaleRatio
-                font.family: MoneroComponents.Style.fontLight.name
-
-                color: MoneroComponents.Style.defaultFontColor
-            }
-
-            TextField {
-                id : passwordInput2
-                Layout.topMargin: 6
-                Layout.fillWidth: true
-                anchors.left: parent.left
-                horizontalAlignment: TextInput.AlignLeft
-                verticalAlignment: TextInput.AlignVCenter
-                font.family: MoneroComponents.Style.fontLight.name
-                font.pixelSize: 24 * scaleRatio
-                echoMode: TextInput.Password
-                KeyNavigation.tab: okButton
-                bottomPadding: 10
-                leftPadding: 10
-                topPadding: 10
-                color: MoneroComponents.Style.defaultFontColor
-
-                background: Rectangle {
-                    radius: 2
-                    border.color: Qt.rgba(255, 255, 255, 0.35)
-                    border.width: 1
-                    color: "black"
-
-                    Image {
-                        width: 12
-                        height: 16
-                        source: "../images/lockIcon.png"
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.right: parent.right
-                        anchors.rightMargin: 20
-                    }
-                }
-
-                Keys.onReturnPressed: {
-                    if (passwordInput1.text === passwordInput2.text) {
-                        root.close()
-                        root.accepted()
-                    }
-                }
-                Keys.onEscapePressed: {
-                    root.close()
-                    root.rejected()
-                }
-            }
-
-            // padding
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.alignment: Qt.AlignHCenter
-                height: 10
-                opacity: 0
-                color: "black"
-            }
-
-            // Ok/Cancel buttons
-            RowLayout {
-                id: buttons
-                spacing: 16 * scaleRatio
-                Layout.topMargin: 16
-                Layout.alignment: Qt.AlignRight
-
-                MoneroComponents.StandardButton {
-                    id: cancelButton
-                    text: qsTr("Cancel") + translationManager.emptyString
-                    KeyNavigation.tab: passwordInput1
-                    onClicked: {
-                        root.close()
-                        root.rejected()
-                    }
-                }
-                MoneroComponents.StandardButton {
-                    id: okButton
-                    text: qsTr("Continue")
-                    KeyNavigation.tab: cancelButton
-                    enabled: passwordInput1.text === passwordInput2.text
-                    onClicked: {
-                        root.close()
-                        root.accepted()
-                    }
-                }
-            }
-        }
-    }
-}

components/PasswordDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2019, The Monero Project
 //
 // All rights reserved.
 //
@@ -26,147 +26,276 @@
 // 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.7
+import QtQuick 2.9
 import QtQuick.Controls 2.0
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Window 2.0
+import FontAwesome 1.0
 
-import "../components" as MoneroComponents
+import "." as MoneroComponents
+import "effects/" as MoneroEffects
+import "../js/Utils.js" as Utils
 
 Item {
     id: root
     visible: false
-    z: parent.z + 2
 
-    property alias password: passwordInput.text
+    property alias password: passwordInput1.text
     property string walletName
+    property var okButtonText
+    property string okButtonIcon
+    property string errorText
+    property bool passwordDialogMode
+    property bool passphraseDialogMode
+    property bool newPasswordDialogMode
 
     // same signals as Dialog has
     signal accepted()
+    signal acceptedNewPassword()
+    signal acceptedPassphrase()
     signal rejected()
+    signal rejectedNewPassword()
+    signal rejectedPassphrase()
     signal closeCallback()
 
-    function open(walletName) {
-        inactiveOverlay.visible = true // draw appwindow inactive
+    function _openInit(walletName, errorText) {
+        capsLockTextLabel.visible = oshelper.isCapsLock();
+        passwordInput1.reset();
+        passwordInput2.reset();
+        if(!appWindow.currentWallet || appWindow.active)
+            passwordInput1.input.forceActiveFocus();
         root.walletName = walletName ? walletName : ""
+        errorTextLabel.text = errorText ? errorText : "";
         leftPanel.enabled = false
         middlePanel.enabled = false
-        titleBar.enabled = false
-        show()
+        wizard.enabled = false
+        titleBar.state = "essentials"
         root.visible = true;
-        passwordInput.forceActiveFocus();
-        passwordInput.text = ""
+        appWindow.hideBalanceForced = true;
+        appWindow.updateBalance();
+    }
+
+    function open(walletName, errorText, okButtonText, okButtonIcon) {
+        passwordDialogMode = true;
+        passphraseDialogMode = false;
+        newPasswordDialogMode = false;
+        root.okButtonText = okButtonText;
+        root.okButtonIcon = okButtonIcon ? okButtonIcon : "";
+        _openInit(walletName, errorText);
+    }
+
+    function openPassphraseDialog() {
+        passwordDialogMode = false;
+        passphraseDialogMode = true;
+        newPasswordDialogMode = false;
+        _openInit("", "");
+    }
+
+    function openNewPasswordDialog() {
+        passwordDialogMode = false;
+        passphraseDialogMode = false;
+        newPasswordDialogMode = true;
+        _openInit("", "");
+    }
+
+    function showError(errorText) {
+        open(root.walletName, errorText);
     }
 
     function close() {
-        inactiveOverlay.visible = false
         leftPanel.enabled = true
         middlePanel.enabled = true
-        titleBar.enabled = true
+        wizard.enabled = true
+        titleBar.state = "default"
+
         root.visible = false;
+        appWindow.hideBalanceForced = false;
+        appWindow.updateBalance();
         closeCallback();
     }
 
+    function onOk() {
+        if (!passwordDialogMode && passwordInput1.text !== passwordInput2.text) {
+            return;
+        }
+        root.close()
+        if (passwordDialogMode) {
+            root.accepted()
+        } else if (newPasswordDialogMode) {
+            root.acceptedNewPassword()
+        } else if (passphraseDialogMode) {
+            root.acceptedPassphrase()
+        }
+    }
+
+    function onCancel() {
+        root.close()
+        if (passwordDialogMode) {
+            root.rejected()
+        } else if (newPasswordDialogMode) {
+            root.rejectedNewPassword()
+        } else if (passphraseDialogMode) {
+            root.rejectedPassphrase()
+        }
+    }
+
     ColumnLayout {
-        z: inactiveOverlay.z + 1
         id: mainLayout
         spacing: 10
-        anchors { fill: parent; margins: 35 * scaleRatio }
+        anchors { fill: parent; margins: 35 }
 
         ColumnLayout {
             id: column
 
             Layout.fillWidth: true
             Layout.alignment: Qt.AlignHCenter
-            Layout.maximumWidth: 400 * scaleRatio
+            Layout.maximumWidth: 400
 
             Label {
-                text: root.walletName.length > 0 ? qsTr("Please enter wallet password for: ") + root.walletName : qsTr("Please enter wallet password")
-                anchors.left: parent.left
+                text: {
+                    if (newPasswordDialogMode) {
+                        return qsTr("Please enter new wallet password") + translationManager.emptyString;
+                    } else {
+                        var device = passwordDialogMode ? qsTr("wallet password") : qsTr("wallet device passphrase");
+                        return (root.walletName.length > 0 ? qsTr("Please enter %1 for: ").arg(device) + root.walletName : qsTr("Please enter %1").arg(device)) + translationManager.emptyString;
+                    }
+                }
                 Layout.fillWidth: true
 
-                font.pixelSize: 16 * scaleRatio
+                font.pixelSize: 16
                 font.family: MoneroComponents.Style.fontLight.name
 
                 color: MoneroComponents.Style.defaultFontColor
             }
 
-            TextField {
-                id : passwordInput
+            Label {
+                text: qsTr("Warning: passphrase entry on host is a security risk as it can be captured by malware. It is advised to prefer device-based passphrase entry.") + translationManager.emptyString
+                visible: passphraseDialogMode
+                Layout.fillWidth: true
+                wrapMode: Text.Wrap
+
+                font.pixelSize: 14
+                font.family: MoneroComponents.Style.fontLight.name
+
+                color: MoneroComponents.Style.warningColor
+            }
+
+            Label {
+                id: errorTextLabel
+                visible: root.errorText || text !== ""
+                color: MoneroComponents.Style.errorColor
+                font.pixelSize: 16
+                font.family: MoneroComponents.Style.fontLight.name
+                Layout.fillWidth: true
+                wrapMode: Text.Wrap
+            }
+
+            Label {
+                id: capsLockTextLabel
+                visible: false
+                color: MoneroComponents.Style.errorColor
+                font.pixelSize: 16
+                font.family: MoneroComponents.Style.fontLight.name
+                Layout.fillWidth: true
+                wrapMode: Text.Wrap
+                text: qsTr("CAPSLOCKS IS ON.") + translationManager.emptyString;
+            }
+
+            MoneroComponents.LineEdit {
+                id: passwordInput1
+                password: true
                 Layout.topMargin: 6
                 Layout.fillWidth: true
-                anchors.left: parent.left
-                horizontalAlignment: TextInput.AlignLeft
-                verticalAlignment: TextInput.AlignVCenter
-                font.family: MoneroComponents.Style.fontLight.name
-                font.pixelSize: 24 * scaleRatio
-                echoMode: TextInput.Password
-                KeyNavigation.tab: okButton
-                bottomPadding: 10
-                leftPadding: 10
-                topPadding: 10
-                color: MoneroComponents.Style.defaultFontColor
-
-                background: Rectangle {
-                    radius: 2
-                    border.color: Qt.rgba(255, 255, 255, 0.35)
-                    border.width: 1
-                    color: "black"
-
-                    Image {
-                        width: 12
-                        height: 16
-                        source: "../images/lockIcon.png"
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.right: parent.right
-                        anchors.rightMargin: 20
+                KeyNavigation.tab: {
+                    if (passwordDialogMode) {
+                        return okButton
+                    } else {
+                        return passwordInput2
                     }
                 }
+                onTextChanged: capsLockTextLabel.visible = oshelper.isCapsLock();
 
-                Keys.onReturnPressed: {
-                    root.close()
-                    root.accepted()
+                Keys.enabled: root.visible
+                Keys.onEnterPressed: root.onOk()
+                Keys.onReturnPressed: root.onOk()
+                Keys.onEscapePressed: root.onCancel()
+            }
 
-                }
-                Keys.onEscapePressed: {
-                    root.close()
-                    root.rejected()
+            // padding
+            Rectangle {
+                visible: !passwordDialogMode
+                Layout.fillWidth: true
+                Layout.alignment: Qt.AlignHCenter
+                height: 10
+                opacity: 0
+                color: "black"
+            }
 
-                }
+            Label {
+                visible: !passwordDialogMode
+                text: newPasswordDialogMode ? qsTr("Please confirm new password") : qsTr("Please confirm wallet device passphrase") + translationManager.emptyString
+                Layout.fillWidth: true
+
+                font.pixelSize: 16
+                font.family: MoneroComponents.Style.fontLight.name
+
+                color: MoneroComponents.Style.defaultFontColor
+            }
+
+            MoneroComponents.LineEdit {
+                id: passwordInput2
+                passwordLinked: passwordInput1
+                visible: !passwordDialogMode
+                Layout.topMargin: 6
+                Layout.fillWidth: true
+                KeyNavigation.tab: okButton
+                onTextChanged: capsLockTextLabel.visible = oshelper.isCapsLock();
+
+                Keys.enabled: root.visible
+                Keys.onEnterPressed: root.onOk()
+                Keys.onReturnPressed: root.onOk()
+                Keys.onEscapePressed: root.onCancel()
+            }
+
+            // padding
+            Rectangle {
+                visible: !passwordDialogMode
+                Layout.fillWidth: true
+                Layout.alignment: Qt.AlignHCenter
+                height: 10
+                opacity: 0
+                color: "black"
             }
 
             // Ok/Cancel buttons
             RowLayout {
                 id: buttons
-                spacing: 16 * scaleRatio
+                spacing: 16
                 Layout.topMargin: 16
                 Layout.alignment: Qt.AlignRight
 
                 MoneroComponents.StandardButton {
                     id: cancelButton
+                    primary: false
                     small: true
                     text: qsTr("Cancel") + translationManager.emptyString
-                    KeyNavigation.tab: passwordInput
-                    onClicked: {
-                        root.close()
-                        root.rejected()
-                    }
+                    KeyNavigation.tab: passwordInput1
+                    onClicked: onCancel()
                 }
 
                 MoneroComponents.StandardButton {
                     id: okButton
+                    fontAwesomeIcon: true
+                    rightIcon: okButtonIcon
                     small: true
-                    text: qsTr("Continue")
+                    text: okButtonText ? okButtonText : qsTr("Ok") + translationManager.emptyString
                     KeyNavigation.tab: cancelButton
-                    onClicked: {
-                        root.close()
-                        root.accepted()
-                    }
+                    enabled: (passwordDialogMode == true) ? true : passwordInput1.text === passwordInput2.text
+                    onClicked: onOk()
                 }
             }
-
         }
     }
 }

components/PrivacyLevel.qml

@@ -1,151 +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.0
-
-Item {
-    id: item
-    property int fillLevel: 0
-    height: 70
-    clip: true
-
-    Rectangle {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        height: 24
-        //radius: 4
-        color: "#DBDBDB"
-    }
-
-    Rectangle {
-        id: bar
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.topMargin: 1
-        height: 24
-        //radius: 4
-        color: "#FFFFFF"
-
-        Rectangle {
-            id: fillRect
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            anchors.margins: 4
-            //radius: 2
-            width: row.x
-
-            color: "#FF6C3C"
-
-            Timer {
-                interval: 500
-                running: true
-                repeat: false
-                onTriggered: fillRect.loaded = true
-            }
-
-            property bool loaded: false
-            Behavior on width {
-                enabled: fillRect.loaded
-                NumberAnimation { duration: 100; easing.type: Easing.InQuad }
-            }
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            function positionBar() {
-                var xDiff = 999999
-                var index = -1
-                for(var i = 0; i < 14; ++i) {
-                    var tmp = Math.abs(row.positions[i].currentX + row.x - mouseX)
-                    if(tmp < xDiff) {
-                        xDiff = tmp
-                        index = i
-                    }
-                }
-
-                if(index !== -1) {
-                    fillRect.width = Qt.binding(function(){ return row.positions[index].currentX + row.x })
-                    item.fillLevel = index
-                }
-            }
-
-            onClicked: positionBar()
-            onMouseXChanged: positionBar()
-        }
-    }
-
-    Row {
-        id: row
-        anchors.right: bar.right
-        anchors.rightMargin: 8
-        anchors.top: bar.bottom
-        anchors.topMargin: -1
-        property var positions: new Array()
-
-        Row {
-            id: row2
-            spacing: bar.width / 14
-
-            Repeater {
-                model: 4
-
-                delegate: TickDelegate {
-                    id: delegateItem2
-                    currentX: x + row2.x
-                    currentIndex: index
-                    mainTick: currentIndex === 0
-                    Component.onCompleted: {
-                        row.positions[currentIndex] = delegateItem2
-                    }
-                }
-            }
-        }
-
-        Row {
-            id: row1
-            spacing: bar.width / 14
-
-            Repeater {
-                model: 10
-
-                delegate: TickDelegate {
-                    id: delegateItem1
-                    currentX: x + row1.x
-                    currentIndex: index + 4
-                    mainTick: currentIndex === 13
-                    Component.onCompleted: {
-                        row.positions[currentIndex] = delegateItem1
-                    }
-                }
-            }
-        }
-    }
-}

components/PrivacyLevelSmall.qml

@@ -1,191 +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.0
-
-Item {
-    id: item
-    property alias interactive: mouseArea.enabled
-    property alias background: bar.color
-    property int fillLevel: 0
-    height: 40
-    clip: true
-
-    onFillLevelChanged: {
-        if (!interactive) {
-            //print("fillLevel: " + fillLevel)
-            fillRect.width = row.positions[fillLevel].currentX + row.x
-        }
-    }
-
-    Rectangle {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        height: 24
-        //radius: 4
-        color: "#DBDBDB"
-    }
-
-    Rectangle {
-        id: bar
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.topMargin: 1
-        height: 24
-        //radius: 4
-        color: "#FFFFFF"
-
-        Rectangle {
-            id: fillRect
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            anchors.margins: 4
-            //radius: 2
-            width: row.x
-
-            color: "#FF6C3C"
-
-            Timer {
-                interval: 500
-                running: true
-                repeat: false
-                onTriggered: fillRect.loaded = true
-            }
-
-            property bool loaded: false
-            Behavior on width {
-                enabled: fillRect.loaded
-                NumberAnimation { duration: 100; easing.type: Easing.InQuad }
-            }
-        }
-
-        Text {
-            anchors.verticalCenter: parent.verticalCenter
-            font.family: "Arial"
-            font.pixelSize: 15
-            color: "#000000"
-            x: row.x + (row.positions[0] !== undefined ? row.positions[0].currentX - 3 : 0) - width
-            text: qsTr("Low") + translationManager.emptyString
-        }
-
-        Text {
-            anchors.verticalCenter: parent.verticalCenter
-            font.family: "Arial"
-            font.pixelSize: 15
-            color: "#000000"
-            x: row.x + (row.positions[4] !== undefined ? row.positions[4].currentX - 3 : 0) - width
-            text: qsTr("Medium") + translationManager.emptyString
-        }
-
-        Text {
-            anchors.verticalCenter: parent.verticalCenter
-            font.family: "Arial"
-            font.pixelSize: 15
-            color: "#000000"
-            x: row.x + (row.positions[13] !== undefined ? row.positions[13].currentX - 3 : 0) - width
-            text: qsTr("High") + translationManager.emptyString
-        }
-
-        MouseArea {
-            id: mouseArea
-            anchors.fill: parent
-            function positionBar() {
-                var xDiff = 999999
-                var index = -1
-                for(var i = 0; i < 14; ++i) {
-                    var tmp = Math.abs(row.positions[i].currentX + row.x - mouseX)
-                    if(tmp < xDiff) {
-                        xDiff = tmp
-                        index = i
-                    }
-                }
-
-                if(index !== -1) {
-                    fillRect.width = Qt.binding(function(){ return row.positions[index].currentX + row.x })
-                    item.fillLevel = index
-                    print ("fillLevel: " + item.fillLevel)
-                }
-            }
-
-            onClicked: positionBar()
-            onMouseXChanged: positionBar()
-        }
-    }
-
-    Row {
-        id: row
-        anchors.right: bar.right
-        anchors.rightMargin: 8
-        anchors.top: bar.bottom
-        anchors.topMargin: 5
-        property var positions: []
-
-        Row {
-            id: row2
-            spacing: ((bar.width - 8) / 2.23) / 4
-
-            Repeater {
-                model: 4
-
-                delegate: Rectangle {
-                    id: delegateItem2
-                    property int currentX: x + row2.x
-                    height: 8
-                    width: 1
-                    color: "#DBDBDB"
-                    Component.onCompleted: {
-                        row.positions[index] = delegateItem2
-                    }
-                }
-            }
-        }
-
-        Row {
-            id: row1
-            spacing: ((bar.width - 8) / 2.23) / 10
-
-            Repeater {
-                model: 10
-
-                delegate: Rectangle {
-                    id: delegateItem1
-                    property int currentX: x + row1.x
-                    height: index === 4 ? 8 : 4
-                    width: 1
-                    color: "#DBDBDB"
-                    Component.onCompleted: {
-                        row.positions[index + 4] = delegateItem1
-                    }
-                }
-            }
-        }
-    }
-}

components/ProcessingSplash.qml

@@ -26,22 +26,26 @@
 // 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.0
+import QtQuick 2.9
 import QtQuick.Window 2.1
 import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.1
 
+import "../components" as MoneroComponents
+
 Rectangle {
     id: root
-    color: "white"
+    color: MoneroComponents.Style.blackTheme ? "black" : "white"
     visible: false
-    z:11
+    radius: 10
+    border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25)
+    border.width: 1
+    z: 11
     property alias messageText: messageTitle.text
-    property alias heightProgressText : heightProgress.text
 
-    width: 200 * scaleRatio
-    height: 100 * scaleRatio
-    opacity: 0.7
+    width: 100
+    height: 50
 
     function show() {
         root.visible = true;
@@ -54,38 +58,55 @@ Rectangle {
     ColumnLayout {
         id: rootLayout
 
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.verticalCenter: parent.verticalCenter
+        anchors.centerIn: parent
 
-        anchors.leftMargin: 30 * scaleRatio
-        anchors.rightMargin: 30 * scaleRatio
+        anchors.leftMargin: 30
+        anchors.rightMargin: 30
 
-        BusyIndicator {
-            running: parent.visible
+        spacing: 21
+
+        Item {
             Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.preferredHeight: 80
+
+            Image {
+                id: imgLogo
+                width: 60
+                height: 60
+                anchors.centerIn: parent
+                source: "qrc:///images/monero-vector.svg"
+                mipmap: true
+            }
+
+            BusyIndicator {
+                running: parent.visible
+                anchors.centerIn: imgLogo
+                style: BusyIndicatorStyle {
+                    indicator: Image {
+                        visible: control.running
+                        source: "qrc:///images/busy-indicator.png"
+                        RotationAnimator on rotation {
+                            running: control.running
+                            loops: Animation.Infinite
+                            duration: 1000
+                            from: 0
+                            to: 360
+                        }
+                    }
+                }
+            }
         }
 
-        Text {
+
+        MoneroComponents.TextPlain {
             id: messageTitle
-            text: "Please wait..."
-            font {
-                pixelSize: 22 * scaleRatio
-            }
-            horizontalAlignment: Text.AlignHCenter
-            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
-            Layout.fillWidth: true
-        }
-
-
-        Text {
-            id: heightProgress
-            font {
-                pixelSize: 18 * scaleRatio
-            }
+            text: qsTr("Please wait...") + translationManager.emptyString
+            font.pixelSize: 24
             horizontalAlignment: Text.AlignHCenter
             Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
             Layout.fillWidth: true
+            themeTransition: false
+            color: MoneroComponents.Style.defaultFontColor
         }
     }
 }

components/ProgressBar.qml

@@ -26,7 +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 QtQuick 2.0
+import QtQuick 2.9
 import moneroComponents.Wallet 1.0
 
 import "../components" as MoneroComponents
@@ -42,57 +42,75 @@ Rectangle {
     function updateProgress(currentBlock,targetBlock, blocksToSync, statusTxt){
         if(targetBlock > 0) {
             var remaining = (currentBlock < targetBlock) ? targetBlock - currentBlock : 0
-            var progressLevel = (blocksToSync > 0 && blocksToSync != remaining) ? (100*(blocksToSync - remaining)/blocksToSync).toFixed(0) : (100*(currentBlock / targetBlock)).toFixed(0)
+            var progressLevel = (blocksToSync > 0 ) ? (100*(blocksToSync - remaining)/blocksToSync).toFixed(0) : 100
             fillLevel = progressLevel
             if(typeof statusTxt != "undefined" && statusTxt != "") {
                 progressText.text = statusTxt;
+                progressTextValue.text = "";
             } else {
-                progressText.text = syncText + remaining.toFixed(0);
+                progressText.text = syncText;
+                progressTextValue.text = remaining.toFixed(0);
             }
         }
     }
 
     Item {
         anchors.top: item.top
-        anchors.topMargin: 10 * scaleRatio
-        anchors.leftMargin: 15 * scaleRatio
-        anchors.rightMargin: 15 * scaleRatio
+        anchors.topMargin: 10
+        anchors.leftMargin: 15
+        anchors.rightMargin: 15
         anchors.fill: parent
 
-        Text {
+        MoneroComponents.TextPlain {
             id: progressText
             anchors.top: parent.top
             anchors.topMargin: 6
             font.family: MoneroComponents.Style.fontMedium.name
-            font.pixelSize: 13 * scaleRatio
-            font.bold: true
-            color: "white"
-            text: qsTr("Synchronizing %1").arg(syncType)
-            height: 18 * scaleRatio
+            font.pixelSize: 13
+            font.bold: MoneroComponents.Style.progressBarProgressTextBold
+            color: MoneroComponents.Style.defaultFontColor
+            text: qsTr("Synchronizing %1").arg(syncType) + translationManager.emptyString
+            height: 18
         }
 
-        Text {
+        MoneroComponents.TextPlain {
             id: progressTextValue
             anchors.top: parent.top
             anchors.topMargin: 6
             anchors.right: parent.right
             font.family: MoneroComponents.Style.fontMedium.name
-            font.pixelSize: 13 * scaleRatio
-            font.bold: true
-            color: "white"
-            height:18 * scaleRatio
+            font.pixelSize: 13
+            font.bold: MoneroComponents.Style.progressBarProgressTextBold
+            color: MoneroComponents.Style.defaultFontColor
+            height:18
         }
 
-
         Rectangle {
             id: bar
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.top: progressText.bottom
             anchors.topMargin: 4
-            height: 8 * scaleRatio
-            radius: 8 * scaleRatio
-            color: "#333333" // progressbar bg
+            height: 8
+            radius: 8
+            color: MoneroComponents.Style.progressBarBackgroundColor
+
+            states: [
+                State {
+                    name: "black";
+                    when: MoneroComponents.Style.blackTheme
+                    PropertyChanges { target: bar; color: MoneroComponents.Style._b_progressBarBackgroundColor}
+                }, State {
+                    name: "white";
+                    when: !MoneroComponents.Style.blackTheme
+                    PropertyChanges { target: bar; color: MoneroComponents.Style._w_progressBarBackgroundColor}
+                }
+            ]
+
+            transitions: Transition {
+                enabled: appWindow.themeTransition
+                ColorAnimation { properties: "color"; easing.type: Easing.InOutQuad; duration: 300 }
+            }
 
             Rectangle {
                 id: fillRect
@@ -100,10 +118,9 @@ Rectangle {
                 anchors.bottom: parent.bottom
                 anchors.left: parent.left
                 height: bar.height
-                property int maxWidth: bar.width * scaleRatio
+                property int maxWidth: bar.width
                 width: (maxWidth * fillLevel) / 100
                 radius: 8
-                // could change color based on progressbar status; if(item.fillLevel < 99 )
                 color: "#FA6800"
             }
 
@@ -111,12 +128,9 @@ Rectangle {
                 color:"#333"
                 anchors.bottom: parent.bottom
                 anchors.left: parent.left
-                anchors.leftMargin: 8 * scaleRatio
+                anchors.leftMargin: 8
             }
         }
 
     }
-
-
-
 }

components/QRCodeScanner.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2018, The Monero Project
+// Copyright (c) 2014-2020, The Monero Project
 //
 // All rights reserved.
 //
@@ -26,7 +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 QtQuick 2.0
+import QtQuick 2.9
 import QtMultimedia 5.4
 import QtQuick.Dialogs 1.2
 import moneroComponents.QRCodeScanner 1.0
@@ -53,6 +53,7 @@ Rectangle {
                 script: {
 		    root.visible = true
                     camera.captureMode = Camera.CaptureStillImage
+                    camera.cameraState = Camera.ActiveState
                     camera.start()
                     finder.enabled = true
                 }
@@ -65,6 +66,7 @@ Rectangle {
                     camera.stop()
 		    root.visible = false
                     finder.enabled = false
+                    camera.cameraState = Camera.UnloadedState
                 }
             }
         }
@@ -74,6 +76,7 @@ Rectangle {
         id: camera
         objectName: "qrCameraQML"
         captureMode: Camera.CaptureStillImage
+        cameraState: Camera.UnloadedState
 
         focus {
             focusMode: Camera.FocusContinuous
@@ -83,9 +86,14 @@ Rectangle {
         id : finder
         objectName: "QrFinder"
         onDecoded : {
-            root.qrcode_decoded(address, payment_id, amount, tx_description, recipient_name, extra_parameters)
-            root.state = "Stopped"
-	}
+            const parsed = walletManager.parse_uri_to_object(data);
+            if (!parsed.error) {
+                root.qrcode_decoded(parsed.address, parsed.payment_id, parsed.amount, parsed.tx_description, parsed.recipient_name, parsed.extra_parameters);
+                root.state = "Stopped";
+            } else {
+                onNotifyError(parsed.error);
+            }
+        }
         onNotifyError : {
             if( warning )
                 messageDialog.icon = StandardIcon.Critical

components/RadioButton.qml

@@ -26,22 +26,23 @@
 // 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.0
+import QtQuick 2.9
 import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
 
-RowLayout {
+Item {
     id: radioButton
     property alias text: label.text
     property bool checked: false
-    property int fontSize: 14 * scaleRatio
+    property int fontSize: 14
     property alias fontColor: label.color
     signal clicked()
-    height: 26 * scaleRatio
+    height: 26
+    width: layout.width
     // legacy properties
-    property var checkedColor: "white"
-    property var borderColor: checked ? Qt.rgba(1, 1, 1, 0.35) : Qt.rgba(1, 1, 1, 0.25)
+    property var checkedColor: MoneroComponents.Style.blackTheme ? "white" : "#666666"
+    property var borderColor: checked ? MoneroComponents.Style.inputBorderColorActive : MoneroComponents.Style.inputBorderColorInActive
 
     function toggle(){
         radioButton.checked = !radioButton.checked
@@ -49,15 +50,14 @@ RowLayout {
     }
 
     RowLayout {
-        Layout.fillWidth: true
+        id: layout
+
         Rectangle {
             id: button
-            anchors.left: parent.left
-            y: 0
             color: "transparent"
             border.color: borderColor
-            width: radioButton.height
             height: radioButton.height
+            width: radioButton.height
             radius: radioButton.height
 
             Rectangle {
@@ -65,37 +65,28 @@ RowLayout {
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.verticalCenter: parent.verticalCenter
                 color: checkedColor
-                width: 10 * scaleRatio
-                height: 10 * scaleRatio
+                width: 10
+                height: 10
                 radius: 10
                 opacity: 0.8
             }
-
-            MouseArea {
-                anchors.fill: parent
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    toggle()
-                }
-            }
         }
 
-        Text {
+        MoneroComponents.TextPlain {
             id: label
-            anchors.left: button.right
-            anchors.leftMargin: !isMobile ? 10 : 8
+            Layout.leftMargin: 10
             color: MoneroComponents.Style.defaultFontColor
             font.family: MoneroComponents.Style.fontRegular.name
             font.pixelSize: radioButton.fontSize
             wrapMode: Text.Wrap
+        }
+    }
 
-            MouseArea {
-                anchors.fill: parent
-                cursorShape: Qt.PointingHandCursor
-                onClicked: {
-                    toggle()
-                }
-            }
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        onClicked: {
+            toggle()
         }
     }
 }

components/RemoteNodeEdit.qml

@@ -28,13 +28,14 @@
 
 import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.2
-import QtQuick 2.2
+import QtQuick 2.9
 import QtQuick.Layouts 1.1
 
+import "../js/Utils.js" as Utils
 import "../components" as MoneroComponents
 
 GridLayout {
-    columns: (isMobile) ? 1 : 2
+    columns: 2
     columnSpacing: 32
     id: root
     property alias daemonAddrText: daemonAddr.text
@@ -42,23 +43,43 @@ GridLayout {
     property alias daemonAddrLabelText: daemonAddr.labelText
     property alias daemonPortLabelText: daemonPort.labelText
 
+    property string initialAddress: ""
+    property var initialHostPort: initialAddress.match(/^(.*?)(?:\:?(\d*))$/)
+
     // TODO: LEGACY; remove these placeHolder variables when
     // the wizards get redesigned to the black-theme
     property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name
     property bool placeholderFontBold: false
-    property int placeholderFontSize: 18 * scaleRatio
+    property int placeholderFontSize: 15
     property string placeholderColor: MoneroComponents.Style.defaultFontColor
     property real placeholderOpacity: 0.35
+    property int labelFontSize: 14
 
-    property string lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15)
-    property string lineEditBackgroundColor: "white"
-    property string lineEditFontColor: "black"
-    property bool lineEditFontBold: true
+    property string lineEditBackgroundColor: "transparent"
+    property string lineEditBorderColor: MoneroComponents.Style.inputBorderColorInActive
+    property string lineEditFontColor: MoneroComponents.Style.defaultFontColor
+    property bool lineEditFontBold: false
+    property int lineEditFontSize: 15
+
+    // Author: David M. Syzdek https://github.com/syzdek https://gist.github.com/syzdek/6086792
+    readonly property var ipv6Regex: /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe08:(:[0-9a-fA-F]{1,4}){2,2}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$/
 
     signal editingFinished()
+    signal textChanged()
+
+    function isValid() {
+        return daemonAddr.text.trim().length > 0 && daemonPort.acceptableInput
+    }
 
     function getAddress() {
-        return daemonAddr.text.trim() + ":" + daemonPort.text.trim()
+        var addr = daemonAddr.text.trim();
+        var port = daemonPort.text.trim();
+
+        // validation
+        if(addr === "" || addr.length < 2) return "";
+        if(!Utils.isNumeric(port)) return "";
+
+        return addr + ":" + port;
     }
 
     LineEdit {
@@ -70,11 +91,18 @@ GridLayout {
         placeholderFontSize: root.placeholderFontSize
         placeholderColor: root.placeholderColor
         placeholderOpacity: root.placeholderOpacity
-        onEditingFinished: root.editingFinished()
+        labelFontSize: root.labelFontSize
         borderColor: lineEditBorderColor
         backgroundColor: lineEditBackgroundColor
         fontColor: lineEditFontColor
         fontBold: lineEditFontBold
+        fontSize: lineEditFontSize
+        onEditingFinished: {
+            text = text.replace(ipv6Regex, "[$1]");
+            root.editingFinished();
+        }
+        onTextChanged: root.textChanged()
+        text: initialHostPort[1]
     }
 
     LineEdit {
@@ -86,10 +114,16 @@ GridLayout {
         placeholderFontSize: root.placeholderFontSize
         placeholderColor: root.placeholderColor
         placeholderOpacity: root.placeholderOpacity
-        onEditingFinished: root.editingFinished()
+        labelFontSize: root.labelFontSize
         borderColor: lineEditBorderColor
         backgroundColor: lineEditBackgroundColor
         fontColor: lineEditFontColor
         fontBold: lineEditFontBold
+        fontSize: lineEditFontSize
+        validator: IntValidator{bottom: 1; top: 65535;}
+
+        onEditingFinished: root.editingFinished()
+        onTextChanged: root.textChanged()
+        text: initialHostPort[2]
     }
 }

components/Scroll.qml

@@ -1,84 +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.0
-
-Item {
-    id: scrollItem
-    property var flickable
-    width: 15
-    z: 1
-
-    function flickableContentYChanged() {
-        if(flickable === undefined)
-            return
-
-        var t = flickable.height - scroll.height
-        scroll.y = (flickable.contentY / (flickable.contentHeight - flickable.height)) * t
-    }
-
-    MouseArea {
-        id: scrollArea
-        anchors.fill: parent
-        hoverEnabled: true
-    }
-
-    Rectangle {
-        id: scroll
-
-        width: 4
-        height: {
-            var t = (flickable.height * flickable.height) / flickable.contentHeight
-            return t < 20 ? 20 : t
-        }
-        y: 0; x: 0
-        color: "#DBDBDB"
-        opacity: flickable.moving || handleArea.pressed || scrollArea.containsMouse ? 0.5 : 0
-        visible: flickable.contentHeight > flickable.height
-
-        Behavior on opacity {
-            NumberAnimation { duration: 200; easing.type: Easing.InQuad }
-        }
-
-        MouseArea {
-            id: handleArea
-            anchors.fill: parent
-            drag.target: scroll
-            drag.axis: Drag.YAxis
-            drag.minimumY: 0
-            drag.maximumY: flickable.height - height
-            propagateComposedEvents: true
-
-            onPositionChanged: {
-                if(!pressed) return
-                var dy = scroll.y / (flickable.height - scroll.height)
-                flickable.contentY = (flickable.contentHeight - flickable.height) * dy
-            }
-        }
-    }
-}

components/SearchInput.qml

@@ -1,229 +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.0
-
-import "../components" as MoneroComponents
-
-Item {
-    id: item
-    signal searchClicked(string text, int option)
-    height: 50
-
-    Rectangle {
-        anchors.fill: parent
-        color: "#DBDBDB"
-        //radius: 4
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        anchors.topMargin: 1
-        color: "#FFFFFF"
-        //radius: 4
-
-        Item {
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            width: 45
-
-            Image {
-                anchors.centerIn: parent
-                source: "../images/magnifier.png"
-            }
-        }
-
-        Input {
-            id: input
-            anchors.left: parent.left
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.right: dropdown.left
-            anchors.leftMargin: 45
-            font.pixelSize: 18
-            verticalAlignment: TextInput.AlignVCenter
-            placeholderText: qsTr("Search by...") + translationManager.emptyString
-        }
-
-        Item {
-            id: dropdown
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.right: button.left
-            width: 154
-
-            function hide() { droplist.height = 0 }
-            function containsPoint(px, py) {
-                if(px < 0)
-                    return false
-                if(px > width)
-                    return false
-                if(py < 0)
-                    return false
-                if(py > height + droplist.height)
-                    return false
-                return true
-            }
-
-            Row {
-                anchors.right: parent.right
-                anchors.verticalCenter: parent.verticalCenter
-
-                Text {
-                    id: dropText
-                    width: 114 - 12
-                    anchors.verticalCenter: parent.verticalCenter
-                    font.family: "Arial"
-                    font.pixelSize: 12
-                    font.bold: true
-                    color: "#4A4747"
-                    text: "NAME"
-                }
-
-                Image {
-                    anchors.verticalCenter: parent.verticalCenter
-                    source: "../images/hseparator.png"
-                }
-
-                Item {
-                    height: dropdown.height
-                    width: 38
-
-                    Image {
-                        id: dropIndicator
-                        anchors.centerIn: parent
-                        source: "../images/dropIndicator.png"
-                        rotation: droplist.height === 0 ? 0 : 180
-                    }
-                }
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    if(droplist.height === 0) {
-                        appWindow.currentItem = dropdown
-                        droplist.height = dropcolumn.height + 2
-                    } else {
-                        droplist.height = 0
-                    }
-                }
-            }
-        }
-
-        Rectangle {
-            id: droplist
-            property int currentOption: 0
-
-            width: 154
-            height: 0
-            clip: true
-            x: dropdown.x
-            y: dropdown.height
-            border.width: 1
-            border.color: "#DBDBDB"
-            color: "#FFFFFF"
-
-            Rectangle {
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.leftMargin: 1
-                anchors.rightMargin: 1
-                height: 1
-                color: "#FFFFFF"
-            }
-
-            Behavior on height {
-                NumberAnimation { duration: 100; easing.type: Easing.InQuad }
-            }
-
-            ListModel {
-                id: dropdownModel
-                ListElement { name: "NAME" }
-                ListElement { name: "DESCRIPTION" }
-                ListElement { name: "ADDRESS" }
-            }
-
-            Column {
-                id: dropcolumn
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                anchors.margins: 1
-
-                Repeater {
-                    model: dropdownModel
-                    delegate: Rectangle {
-                        property bool isCurrent: name === dropText.text
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        height: 30
-                        color: delegateArea.pressed || isCurrent ? "#4A4646" : "#FFFFFF"
-
-                        Text {
-                            anchors.verticalCenter: parent.verticalCenter
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-                            elide: Text.ElideRight
-                            anchors.leftMargin: 12
-                            anchors.rightMargin: 12
-                            font.family: "Arial"
-                            font.bold: true
-                            font.pixelSize: 12
-                            color: delegateArea.pressed || parent.isCurrent ? "#FFFFFF" : "#4A4646"
-                            text: name
-                        }
-
-                        MouseArea {
-                            id: delegateArea
-                            anchors.fill: parent
-                            onClicked: {
-                                droplist.currentOption = index
-                                droplist.height = 0
-                                dropText.text = name
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        MoneroComponents.StandardButton {
-            id: button
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            anchors.right: parent.right
-            anchors.margins: 6
-            width: 80
-            text: qsTr("SEARCH")
-            onClicked: item.searchClicked(input.text, droplist.currentOption)
-        }
-    }
-}

components/SettingsListItem.qml

@@ -0,0 +1,115 @@
+import QtQuick 2.9
+import QtQuick.Layouts 1.1
+import FontAwesome 1.0
+
+import "../components" as MoneroComponents
+
+ColumnLayout {
+    id: settingsListItem
+    property alias iconText: iconLabel.text
+    property alias description: area.text
+    property alias title: header.text
+    property bool isLast: false
+    signal clicked()
+
+    Layout.fillWidth: true
+    spacing: 0
+
+    Rectangle {
+        id: root
+        Layout.fillWidth: true
+        Layout.minimumHeight: 75
+        Layout.preferredHeight: rect.height + 15
+        color: "transparent"
+
+        Rectangle {
+            id: divider
+            anchors.topMargin: 0
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: 1
+            color: MoneroComponents.Style.dividerColor
+            opacity: MoneroComponents.Style.dividerOpacity
+        }
+
+        Rectangle {
+            id: rect
+            width: parent.width
+            height: header.height + area.contentHeight
+            color: "transparent";
+            anchors.left: parent.left
+            anchors.bottomMargin: 4
+            anchors.topMargin: 4
+            anchors.verticalCenter: parent.verticalCenter
+
+            Rectangle {
+                id: icon
+                color: "transparent"
+                height: 32
+                width: 32
+                anchors.left: parent.left
+                anchors.leftMargin: 16
+                anchors.verticalCenter: parent.verticalCenter
+
+                MoneroComponents.Label {
+                    id: iconLabel
+                    fontSize: 32
+                    fontFamily: FontAwesome.fontFamilySolid
+                    anchors.centerIn: parent
+                    fontColor: MoneroComponents.Style.defaultFontColor
+                    styleName: "Solid"
+                }
+            }
+
+            MoneroComponents.TextPlain {
+                id: header
+                anchors.left: icon.right
+                anchors.leftMargin: 16
+                anchors.top: parent.top
+                color: MoneroComponents.Style.defaultFontColor
+                opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8
+                font.bold: true
+                font.family: MoneroComponents.Style.fontRegular.name
+                font.pixelSize: 16
+            }
+
+            Text {
+                id: area
+                anchors.top: header.bottom
+                anchors.topMargin: 4
+                anchors.left: icon.right
+                anchors.leftMargin: 16
+                color: MoneroComponents.Style.dimmedFontColor
+                font.family: MoneroComponents.Style.fontRegular.name
+                font.pixelSize: 15
+                horizontalAlignment: TextInput.AlignLeft
+                wrapMode: Text.WordWrap;
+                leftPadding: 0
+                topPadding: 0
+                width: parent.width - (icon.width + icon.anchors.leftMargin + anchors.leftMargin)
+            }
+        }
+
+        Rectangle {
+            id: bottomDivider
+            anchors.bottom: parent.bottom
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: 1
+            color: MoneroComponents.Style.dividerColor
+            opacity: MoneroComponents.Style.dividerOpacity
+            visible: settingsListItem.isLast
+        }
+
+        MouseArea {
+            cursorShape: Qt.PointingHandCursor
+            anchors.fill: parent
+            hoverEnabled: true
+            onEntered: root.color = MoneroComponents.Style.titleBarButtonHoverColor
+            onExited: root.color = "transparent"
+            onClicked: {
+                settingsListItem.clicked()
+            }
+        }
+    }
+}

components/Slider.qml

@@ -0,0 +1,68 @@
+import QtQuick 2.9
+import QtQuick.Controls 2.0 as QtQuickControls
+import QtQuick.Layouts 1.1
+
+import "../components" as MoneroComponents
+
+ColumnLayout {
+    property alias from: slider.from
+    property alias stepSize: slider.stepSize
+    property alias to: slider.to
+    property alias value: slider.value
+
+    property alias text: label.text
+
+    signal moved()
+
+    spacing: 0
+
+    Text {
+        id: label
+        color: MoneroComponents.Style.defaultFontColor
+        font.pixelSize: 14
+        Layout.fillWidth: true
+    }
+
+    QtQuickControls.Slider {
+        id: slider
+        leftPadding: 0
+        snapMode: QtQuickControls.Slider.SnapAlways
+
+        background: Rectangle {
+            x: parent.leftPadding
+            y: parent.topPadding + parent.availableHeight / 2 - height / 2
+            implicitWidth: 200
+            implicitHeight: 4
+            width: parent.availableWidth
+            height: implicitHeight
+            radius: 2
+            color: MoneroComponents.Style.progressBarBackgroundColor
+
+            Rectangle {
+                width: parent.visualPosition * parent.width
+                height: parent.height
+                color: MoneroComponents.Style.green
+                radius: 2
+            }
+        }
+
+        handle: Rectangle {
+            x: parent.leftPadding + parent.visualPosition * (parent.availableWidth - width)
+            y: parent.topPadding + parent.availableHeight / 2 - height / 2
+            implicitWidth: 18
+            implicitHeight: 18
+            radius: 8
+            color: parent.pressed ? "#f0f0f0" : "#f6f6f6"
+            border.color: MoneroComponents.Style.grey
+        }
+
+        onMoved: parent.moved()
+
+        MouseArea {
+            anchors.fill: parent
+            acceptedButtons: Qt.NoButton
+            hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
+        }
+    }
+}

components/StandardButton.qml

@@ -26,118 +26,151 @@
 // 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.0
+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: ""
-    property string icon: ""
-    property string textColor: button.enabled? MoneroComponents.Style.buttonTextColor: MoneroComponents.Style.buttonTextColorDisabled
-    property string textAlign: rightIcon !== "" ? "left" : "center"
+    property color textColor: !button.enabled
+        ? MoneroComponents.Style.buttonTextColorDisabled
+        : primary
+        ? MoneroComponents.Style.buttonTextColor
+        : MoneroComponents.Style.buttonSecondaryTextColor;
     property bool small: false
     property alias text: label.text
+    property alias fontBold: label.font.bold
     property int fontSize: {
-        if(small) return 14 * scaleRatio;
-        else return 16 * scaleRatio;
+        if(small) return 14;
+        else return 16;
     }
+    property alias label: label
     signal clicked()
 
-    // Dynamic height/width
-    Layout.minimumWidth: {
-        var _padding = 22;
-        if(button.rightIcon !== ""){
-            _padding += 60;
-        }
+    height: small ?  30 : 36
+    width: buttonLayout.width + 22
+    implicitHeight: height
+    implicitWidth: width
 
-        var _width = label.contentWidth + _padding;
-        if(_width <= 50) {
-            return 60;
-        }
-
-        return _width;
-    }
-
-    height: small ?  30 * scaleRatio : 36 * scaleRatio
-
-    function doClick() {
-        // Android workaround
+    function doClick(){
         releaseFocus();
         clicked();
     }
 
     Rectangle {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        height: parent.height - 1
+        id: buttonRect
+        anchors.fill: parent
         radius: 3
-        color: parent.enabled ? MoneroComponents.Style.buttonBackgroundColor : MoneroComponents.Style.buttonBackgroundColorDisabled
         border.width: parent.focus ? 1 : 0
 
-        MouseArea {
-            anchors.fill: parent
-            cursorShape: Qt.PointingHandCursor
-            hoverEnabled: true
+        state: button.enabled ? "active" : "disabled"
+        Component.onCompleted: state = state
 
-            propagateComposedEvents: true
+        states: [
+            State {
+                name: "hover"
+                when: buttonArea.containsMouse || button.focus
+                PropertyChanges {
+                    target: buttonRect
+                    color: primary
+                        ? MoneroComponents.Style.buttonBackgroundColorHover
+                        : MoneroComponents.Style.buttonSecondaryBackgroundColorHover
+                }
+            },
+            State {
+                name: "active"
+                when: button.enabled
+                PropertyChanges {
+                    target: buttonRect
+                    color: primary
+                        ? MoneroComponents.Style.buttonBackgroundColor
+                        : MoneroComponents.Style.buttonSecondaryBackgroundColor
+                }
+            },
+            State {
+                name: "disabled"
+                when: !button.enabled
+                PropertyChanges {
+                    target: buttonRect
+                    color: MoneroComponents.Style.buttonBackgroundColorDisabled
+                }
+            }
+        ]
 
-            // possibly do some hover effects here
-            onEntered: {
-//                if(button.enabled) parent.color = Style.buttonBackgroundColorHover;
-//                else parent.color = Style.buttonBackgroundColorDisabledHover;
-            }
-            onExited: {
-//                if(button.enabled) parent.color = Style.buttonBackgroundColor;
-//                else parent.color = Style.buttonBackgroundColorDisabled;
-            }
+        transitions: Transition {
+            enabled: appWindow.themeTransition
+            ColorAnimation { duration: 100 }
         }
     }
 
-    Text {
-        id: label
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.left: parent.left
-        anchors.right: parent.right
-        horizontalAlignment: textAlign === "center" ? Text.AlignHCenter : Text.AlignLeft
-        anchors.leftMargin: textAlign === "center" ? 0 : 11
-        font.family: MoneroComponents.Style.fontBold.name
-        font.bold: true
-        font.pixelSize: buttonArea.pressed ? button.fontSize - 1 : button.fontSize
-        color: parent.textColor
-        visible: parent.icon === ""
-    }
-
-    Image {
+    RowLayout {
+        id: buttonLayout
+        height: button.height
+        spacing: 11
         anchors.centerIn: parent
-        visible: parent.icon !== ""
-        source: parent.icon
-    }
 
-    Image {
-        visible: parent.rightIcon !== ""
-        anchors.right: parent.right
-        anchors.rightMargin: 11 * scaleRatio
-        anchors.verticalCenter: parent.verticalCenter
-        width: parent.small ? 16 * scaleRatio : 20 * scaleRatio
-        height: parent.small ? 16 * scaleRatio : 20 * scaleRatio
-        source: {
-            if(parent.rightIconInactive !== "" && !parent.enabled){
-                return parent.rightIconInactive;
+        MoneroComponents.TextPlain {
+            id: label
+            font.family: MoneroComponents.Style.fontBold.name
+            font.bold: true
+            font.pixelSize: button.fontSize
+            color: !buttonArea.pressed ? button.textColor : "transparent"
+            visible: text !== ""
+            themeTransition: false
+
+            MoneroComponents.TextPlain {
+                anchors.centerIn: parent
+                color: button.textColor
+                font.bold: label.font.bold
+                font.family: label.font.family
+                font.pixelSize: label.font.pixelSize - 1
+                text: label.text
+                opacity: buttonArea.pressed ? 1 : 0
+                themeTransition: false
             }
-            return parent.rightIcon;
+        }
+
+        Image {
+            visible: !fontAwesomeIcon && button.rightIcon !== ""
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
+            width: button.small ? 16 : 20
+            height: button.small ? 16 : 20
+            source: {
+                if(button.rightIconInactive !== "" && !button.enabled) {
+                    return button.rightIconInactive;
+                }
+                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 {
         id: buttonArea
         anchors.fill: parent
+        hoverEnabled: true
         onClicked: doClick()
         cursorShape: Qt.PointingHandCursor
     }
 
+    Keys.enabled: button.visible
     Keys.onSpacePressed: doClick()
+    Keys.onEnterPressed: Keys.onReturnPressed(event)
     Keys.onReturnPressed: doClick()
 }

components/StandardDialog.qml

@@ -26,7 +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 QtQuick 2.0
+import QtQuick 2.9
 import QtQuick.Controls 2.0
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
@@ -34,6 +34,7 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Window 2.0
 
 import "../components" as MoneroComponents
+import "effects/" as MoneroEffects
 
 Rectangle {
     id: root
@@ -47,6 +48,7 @@ Rectangle {
     property alias textArea: dialogContent
     property alias okText: okButton.text
     property alias cancelText: cancelButton.text
+    property alias closeVisible: closeButton.visible
 
     property var icon
 
@@ -55,12 +57,18 @@ Rectangle {
     signal rejected()
     signal closeCallback();
 
-    Image {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        source: "../images/middlePanelBg.jpg"
+    // background
+    MoneroEffects.GradientBackground {
+        anchors.fill: parent
+        fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor
+        initialStartColor: MoneroComponents.Style.middlePanelBackgroundGradientStart
+        initialStopColor: MoneroComponents.Style.middlePanelBackgroundGradientStop
+        blackColorStart: MoneroComponents.Style._b_middlePanelBackgroundGradientStart
+        blackColorStop: MoneroComponents.Style._b_middlePanelBackgroundGradientStop
+        whiteColorStart: MoneroComponents.Style._w_middlePanelBackgroundGradientStart
+        whiteColorStop: MoneroComponents.Style._w_middlePanelBackgroundGradientStop
+        start: Qt.point(0, 0)
+        end: Qt.point(height, width)
     }
 
     // Make window draggable
@@ -74,70 +82,82 @@ Rectangle {
 
     function open() {
         // Center
-        if(!isMobile) {
-            root.x = parent.width/2 - root.width/2
-            root.y = 100
-        }
-        show()
+        root.x = parent.width/2 - root.width/2
+        root.y = 100
         root.z = 11
         root.visible = true;
     }
 
     function close() {
         root.visible = false;
+        // reset button text
+        okButton.text = qsTr("OK")
+        cancelButton.text = qsTr("Cancel")
+
         closeCallback();
     }
 
     // TODO: implement without hardcoding sizes
-    width: isMobile ? screenWidth : 520
-    height: isMobile ? screenHeight : 380
+    width: 520
+    height: 380
 
     ColumnLayout {
         id: mainLayout
         spacing: 10
-        anchors { fill: parent; margins: 15 }
+        anchors.fill: parent
+        anchors.margins: 20
 
         RowLayout {
             id: column
-            //anchors {fill: parent; margins: 16 }
-            Layout.topMargin: 14 * scaleRatio
-            Layout.alignment: Qt.AlignHCenter
+            Layout.topMargin: 14
+            Layout.fillWidth: true
 
             MoneroComponents.Label {
                 id: dialogTitle
-                horizontalAlignment: Text.AlignHCenter
-                fontSize: 18 * scaleRatio
+                fontSize: 18
                 fontFamily: "Arial"
                 color: MoneroComponents.Style.defaultFontColor
             }
-
         }
 
-        RowLayout {
-            TextArea {
-                id : dialogContent
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-                renderType: Text.QtRendering
-                font.family: MoneroComponents.Style.fontLight.name
-                textFormat: TextEdit.AutoText
-                readOnly: true
-                font.pixelSize: 14 * scaleRatio
-                selectByMouse: false
-                wrapMode: TextEdit.Wrap
-                color: MoneroComponents.Style.defaultFontColor
+        Item {
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            Layout.preferredHeight: 240
 
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        appWindow.showStatusMessage(qsTr("Double tap to copy"),3)
-                    }
-                    onDoubleClicked: {
-                        parent.selectAll()
-                        parent.copy()
-                        parent.deselect()
-                        console.log("copied to clipboard");
-                        appWindow.showStatusMessage(qsTr("Content copied to clipboard"),3)
+            Flickable {
+                id: flickable
+                anchors.fill: parent
+                ScrollBar.vertical: ScrollBar {
+                    onActiveChanged: if (!active && !isMac) active = true
+                }
+                boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+
+                TextArea.flickable: TextArea {
+                    id: dialogContent
+                    Layout.fillWidth: true
+                    Layout.fillHeight: true
+                    renderType: Text.QtRendering
+                    font.family: MoneroComponents.Style.fontLight.name
+                    textFormat: TextEdit.AutoText
+                    readOnly: true
+                    font.pixelSize: 14
+                    selectByMouse: false
+                    wrapMode: TextEdit.Wrap
+                    color: MoneroComponents.Style.defaultFontColor
+
+                    MouseArea {
+                        anchors.fill: parent
+                        onClicked: {
+                            appWindow.showStatusMessage(qsTr("Double tap to copy"),3)
+                        }
+                        onDoubleClicked: {
+                            parent.selectAll()
+                            parent.copy()
+                            parent.deselect()
+                            console.log("copied to clipboard");
+                            appWindow.showStatusMessage(qsTr("Content copied to clipboard"),3)
+                        }
                     }
                 }
             }
@@ -160,17 +180,46 @@ Rectangle {
 
             MoneroComponents.StandardButton {
                 id: okButton
-                text: qsTr("OK")
+                text: qsTr("OK") + translationManager.emptyString
                 KeyNavigation.tab: cancelButton
                 onClicked: {
                     root.close()
                     root.accepted()
-
                 }
             }
         }
     }
 
+    // close icon
+    Rectangle {
+        id: closeButton
+        anchors.top: parent.top
+        anchors.right: parent.right
+        width: 48
+        height: 48
+        color: "transparent"
+
+        MoneroEffects.ImageMask {
+            anchors.centerIn: parent
+            width: 16
+            height: 16
+            image: MoneroComponents.Style.titleBarCloseSource
+            color: MoneroComponents.Style.defaultFontColor
+            opacity: 0.75
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                root.close()
+                root.rejected()
+            }
+            cursorShape: Qt.PointingHandCursor
+            onEntered: closeButton.color = "#262626";
+            onExited: closeButton.color = "transparent";
+        }
+    }
+
     // window borders
     Rectangle{
         width: 1

components/StandardDropdown.qml

@@ -26,23 +26,27 @@
 // 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.0
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtGraphicalEffects 1.0
 
 import "../components" as MoneroComponents
+import "../components/effects/" as MoneroEffects
 
 Item {
     id: dropdown
+    property int itemTopMargin: 0
     property alias dataModel: repeater.model
     property string shadowPressedColor
     property string shadowReleasedColor
-    property string pressedColor
-    property string releasedColor
-    property string textColor: "#FFFFFF"
-    property alias currentIndex: column.currentIndex
-    property bool expanded: false
+    property string pressedColor: MoneroComponents.Style.appWindowBorderColor
+    property string releasedColor: MoneroComponents.Style.titleBarButtonHoverColor
+    property string textColor: MoneroComponents.Style.defaultFontColor
+    property alias currentIndex: columnid.currentIndex
+    readonly property alias expanded: popup.visible
     property int dropdownHeight: 42
-    property int fontHeaderSize: 16 * scaleRatio
-    property int fontItemSize: 14 * scaleRatio
+    property int fontHeaderSize: 16
+    property int fontItemSize: 14
     property string colorBorder: MoneroComponents.Style.inputBorderColorInActive
     property string colorHeaderBackground: "transparent"
     property bool headerBorder: true
@@ -53,49 +57,35 @@ Item {
     signal changed();
 
     onExpandedChanged: if(expanded) appWindow.currentItem = dropdown
-    function hide() { dropdown.expanded = false }
-    function containsPoint(px, py) {
-        if(px < 0)
-            return false
-        if(px > width)
-            return false
-        if(py < 0)
-            return false
-        if(py > height + droplist.height)
-            return false
-        return true
-    }
-
-    // Workaroud for suspected memory leak in 5.8 causing malloc crash on app exit
-    function update() {
-        firstColText.text = column.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(column.currentIndex).column1) + translationManager.emptyString : ""
-    }
 
     Item {
         id: head
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.top: parent.top
+        anchors.topMargin: parent.itemTopMargin
         height: dropdown.dropdownHeight
 
         Rectangle {
-            color: dropdown.colorHeaderBackground
+            color: "transparent"
             border.width: dropdown.headerBorder ? 1 : 0
             border.color: dropdown.colorBorder
             radius: 4
             anchors.fill: parent
         }
 
-        Text {
-            id: firstColText
+        MoneroComponents.TextPlain {
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
-            anchors.leftMargin: 12 * scaleRatio
+            anchors.leftMargin: 12
+            anchors.right: dropIndicator.left
+            anchors.rightMargin: 12
             elide: Text.ElideRight
             font.family: MoneroComponents.Style.fontRegular.name
             font.bold: dropdown.headerFontBold
             font.pixelSize: dropdown.fontHeaderSize
-            color: "#FFFFFF"
+            color: dropdown.textColor
+            text: columnid.currentIndex < repeater.model.count ? qsTr(repeater.model.get(columnid.currentIndex).column1) + translationManager.emptyString : ""
         }
 
         Item {
@@ -103,131 +93,126 @@ Item {
             anchors.top: parent.top
             anchors.bottom: parent.bottom
             anchors.right: parent.right
-            width: 32 * scaleRatio
+            anchors.rightMargin: 12
+            width: dropdownIcon.width
 
             Image {
+                id: dropdownIcon
                 anchors.centerIn: parent
-                source: "../images/whiteDropIndicator.png"
-                rotation: dropdown.expanded ? 180  * scaleRatio : 0
+                source: "qrc:///images/whiteDropIndicator.png"
+                visible: false
+            }
+
+            ColorOverlay {
+                source: dropdownIcon
+                anchors.fill: dropdownIcon
+                color: MoneroComponents.Style.defaultFontColor
+                rotation: dropdown.expanded ? 180  : 0
+                opacity: 1
             }
         }
 
         MouseArea {
             id: dropArea
             anchors.fill: parent
-            onClicked: dropdown.expanded = !dropdown.expanded
+            onClicked: dropdown.expanded ? popup.close() : popup.open()
             hoverEnabled: true
             cursorShape: Qt.PointingHandCursor
         }
     }
 
-    Rectangle {
-        id: droplist
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: head.bottom
-        clip: true
-        height: dropdown.expanded ? column.height : 0
-        color: dropdown.pressedColor
-        //radius: 4
+    Popup {
+        id: popup
+        padding: 0
+        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
 
         Rectangle {
-            anchors.left: parent.left
-            anchors.top: parent.top
-            width: 3 * scaleRatio; height: 3 * scaleRatio
+            id: droplist
+            x: dropdown.x
+            width: dropdown.width
+            y: head.y + head.height
+            clip: true
+            height: dropdown.expanded ? columnid.height : 0
             color: dropdown.pressedColor
-        }
 
-        Rectangle {
-            anchors.right: parent.right
-            anchors.top: parent.top
-            width: 3 * scaleRatio; height: 3 * scaleRatio
-            color: dropdown.pressedColor
-        }
+            Behavior on height {
+                NumberAnimation { duration: 100; easing.type: Easing.InQuad }
+            }
 
-        Behavior on height {
-            NumberAnimation { duration: 100; easing.type: Easing.InQuad }
-        }
+            Column {
+                id: columnid
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.top: parent.top
+                property int currentIndex: 0
 
-        Column {
-            id: column
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.top: parent.top
-            property int currentIndex: 0
+                Repeater {
+                    id: repeater
 
-            Repeater {
-                id: repeater
+                    // Workaround for translations in listElements. All translated strings needs to be listed in this file.
+                    property string stringAutomatic: qsTr("Automatic") + translationManager.emptyString
+                    property string stringSlow: qsTr("Slow (x0.2 fee)") + translationManager.emptyString
+                    property string stringNormal: qsTr("Normal (x1 fee)")  + translationManager.emptyString
+                    property string stringFast: qsTr("Fast (x5 fee)")  + translationManager.emptyString
+                    property string stringFastest: qsTr("Fastest (x200 fee)") + translationManager.emptyString
 
-                // Workaround for translations in listElements. All translated strings needs to be listed in this file.
-                property string stringLow: qsTr("Low (x1 fee)") + translationManager.emptyString
-                property string stringMedium:  qsTr("Medium (x20 fee)") + translationManager.emptyString
-                property string stringHigh:  qsTr("High (x166 fee)") + translationManager.emptyString
-                property string stringSlow: qsTr("Slow (x0.25 fee)") + translationManager.emptyString
-                property string stringDefault: qsTr("Default (x1 fee)") + translationManager.emptyString
-                property string stringFast: qsTr("Fast (x5 fee)") + translationManager.emptyString
-                property string stringFastest: qsTr("Fastest (x41.5 fee)") + translationManager.emptyString
-                property string stringAll:  qsTr("All") + translationManager.emptyString
-                property string stringSent:  qsTr("Sent") + translationManager.emptyString
-                property string stringReceived:  qsTr("Received") + translationManager.emptyString
-
-                delegate: Rectangle {
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    height: (dropdown.dropdownHeight * 0.75) * scaleRatio
-                    //radius: index === repeater.count - 1 ? 4 : 0
-                    color: itemArea.containsMouse || index === column.currentIndex || itemArea.containsMouse ? dropdown.releasedColor : dropdown.pressedColor
-
-                    Text {
-                        id: col1Text
-                        anchors.verticalCenter: parent.verticalCenter
+                    delegate: Rectangle {
                         anchors.left: parent.left
-                        anchors.right: col2Text.left
-                        anchors.leftMargin: 12 * scaleRatio
-                        anchors.rightMargin: 0
-                        font.family: MoneroComponents.Style.fontRegular.name
-                        font.bold: true
-                        font.pixelSize: fontItemSize
-                        color: itemArea.containsMouse || index === column.currentIndex || itemArea.containsMouse ? "#FA6800" : "#FFFFFF"
-                        text: qsTr(column1) + translationManager.emptyString
-                    }
-
-                    Text {
-                        id: col2Text
-                        anchors.verticalCenter: parent.verticalCenter
                         anchors.right: parent.right
-                        anchors.rightMargin: 45 * scaleRatio
-                        font.family: MoneroComponents.Style.fontRegular.name
-                        font.pixelSize: 14 * scaleRatio
-                        color: "#FFFFFF"
-                        text: ""
-                    }
+                        height: (dropdown.dropdownHeight * 0.75)
+                        //radius: index === repeater.count - 1 ? 4 : 0
+                        color: itemArea.containsMouse || index === columnid.currentIndex || itemArea.containsMouse ? dropdown.releasedColor : dropdown.pressedColor
 
-                    Rectangle {
-                        anchors.left: parent.left
-                        anchors.top: parent.top
-                        width: 3 * scaleRatio; height: 3 * scaleRatio
-                        color: parent.color
-                    }
+                        MoneroComponents.TextPlain {
+                            id: col1Text
+                            anchors.verticalCenter: parent.verticalCenter
+                            anchors.left: parent.left
+                            anchors.right: col2Text.left
+                            anchors.leftMargin: 12
+                            anchors.rightMargin: 0
+                            font.family: MoneroComponents.Style.fontRegular.name
+                            font.bold: true
+                            font.pixelSize: fontItemSize
+                            color: itemArea.containsMouse || index === columnid.currentIndex || itemArea.containsMouse ? "#FA6800" : "#FFFFFF"
+                            text: qsTr(column1) + translationManager.emptyString
+                        }
 
-                    Rectangle {
-                        anchors.right: parent.right
-                        anchors.top: parent.top
-                        width: 3 * scaleRatio; height: 3 * scaleRatio
-                        color: parent.color
-                    }
+                        MoneroComponents.TextPlain {
+                            id: col2Text
+                            anchors.verticalCenter: parent.verticalCenter
+                            anchors.right: parent.right
+                            anchors.rightMargin: 45
+                            font.family: MoneroComponents.Style.fontRegular.name
+                            font.pixelSize: 14
+                            color: "#FFFFFF"
+                            text: ""
+                        }
 
-                    MouseArea {
-                        id: itemArea
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
+                        Rectangle {
+                            anchors.left: parent.left
+                            anchors.top: parent.top
+                            width: 3; height: 3
+                            color: parent.color
+                        }
 
-                        onClicked: {
-                            dropdown.expanded = false
-                            column.currentIndex = index
-                            changed();
-                            dropdown.update()
+                        Rectangle {
+                            anchors.right: parent.right
+                            anchors.top: parent.top
+                            width: 3; height: 3
+                            color: parent.color
+                        }
+
+                        MouseArea {
+                            id: itemArea
+                            anchors.fill: parent
+                            hoverEnabled: true
+                            cursorShape: Qt.PointingHandCursor
+
+                            onClicked: {
+                                popup.close()
+                                columnid.currentIndex = index
+                                changed();
+                            }
                         }
                     }
                 }

components/Style.qml

@@ -3,30 +3,195 @@ pragma Singleton
 import QtQuick 2.5
 
 QtObject {
-    property QtObject fontMedium: FontLoader { id: _fontMedium; source: "qrc:/fonts/SFUIDisplay-Medium.otf"; }
-    property QtObject fontBold: FontLoader { id: _fontBold; source: "qrc:/fonts/SFUIDisplay-Bold.otf"; }
-    property QtObject fontLight: FontLoader { id: _fontLight; source: "qrc:/fonts/SFUIDisplay-Light.otf"; }
-    property QtObject fontRegular: FontLoader { id: _fontRegular; source: "qrc:/fonts/SFUIDisplay-Regular.otf"; }
+    property bool blackTheme: true
+    property QtObject fontMedium: FontLoader { id: _fontMedium; source: "qrc:/fonts/Roboto-Medium.ttf"; }
+    property QtObject fontBold: FontLoader { id: _fontBold; source: "qrc:/fonts/Roboto-Bold.ttf"; }
+    property QtObject fontLight: FontLoader { id: _fontLight; source: "qrc:/fonts/Roboto-Light.ttf"; }
+    property QtObject fontRegular: FontLoader { id: _fontRegular; source: "qrc:/fonts/Roboto-Regular.ttf"; }
+
+    property QtObject fontMonoMedium: FontLoader { id: _fontMonoMedium; source: "qrc:/fonts/RobotoMono-Medium.ttf"; }
+    property QtObject fontMonoBold: FontLoader { id: _fontMonoBold; source: "qrc:/fonts/RobotoMono-Bold.ttf"; }
+    property QtObject fontMonoLight: FontLoader { id: _fontMonoLight; source: "qrc:/fonts/RobotoMono-Light.ttf"; }
+    property QtObject fontMonoRegular: FontLoader { id: _fontMonoRegular; source: "qrc:/fonts/RobotoMono-Regular.ttf"; }
 
     property string grey: "#404040"
+    property string orange: "#FF6C3C"
+    property string white: "#FFFFFF"
+    property string green: "#2EB358"
+    property string moneroGrey: "#4C4C4C"
+    property string warningColor: "orange"
 
-    property string defaultFontColor: "white"
-    property string greyFontColor: "#808080"
-    property string dimmedFontColor: "#BBBBBB"
-    property string inputBoxBackground: "black"
-    property string inputBoxBackgroundError: "#FFDDDD"
-    property string inputBoxColor: "white"
-    property string legacy_placeholderFontColor: "#BABABA"
-    property string inputBorderColorActive: Qt.rgba(255, 255, 255, 0.38)
-    property string inputBorderColorInActive: Qt.rgba(255, 255, 255, 0.32)
-    property string inputBorderColorInvalid: Qt.rgba(255, 0, 0, 0.40)
+    property string defaultFontColor: blackTheme ? _b_defaultFontColor : _w_defaultFontColor
+    property string dimmedFontColor: blackTheme ? _b_dimmedFontColor : _w_dimmedFontColor
+    property string lightGreyFontColor: blackTheme ? _b_lightGreyFontColor : _w_lightGreyFontColor
+    property string errorColor: blackTheme ? _b_errorColor : _w_errorColor
+    property string textSelectionColor: blackTheme ? _b_textSelectionColor : _w_textSelectionColor
+    property string textSelectedColor: blackTheme ? _b_textSelectedColor : _w_textSelectedColor
 
-    property string buttonBackgroundColor: "#FA6800"
-    property string buttonBackgroundColorHover: "#E65E00"
-    property string buttonBackgroundColorDisabled: "#707070"
-    property string buttonBackgroundColorDisabledHover: "#808080"
-    property string buttonTextColor: "white"
-    property string buttonTextColorDisabled: "black"
-    property string dividerColor: "white"
-    property real dividerOpacity: 0.20
+    property string inputBoxBackground: blackTheme ? _b_inputBoxBackground : _w_inputBoxBackground
+    property string inputBoxBackgroundDisabled: blackTheme ? _b_inputBoxBackgroundDisabled : _w_inputBoxBackgroundDisabled
+    property string inputBoxBackgroundError: blackTheme ? _b_inputBoxBackgroundError : _w_inputBoxBackgroundError
+    property string inputBoxColor: blackTheme ? _b_inputBoxColor : _w_inputBoxColor
+    property string legacy_placeholderFontColor: blackTheme ? _b_legacy_placeholderFontColor : _w_legacy_placeholderFontColor
+    property string inputBorderColorActive: blackTheme ? _b_inputBorderColorActive : _w_inputBorderColorActive
+    property string inputBorderColorInActive: blackTheme ? _b_inputBorderColorInActive : _w_inputBorderColorInActive
+    property string inputBorderColorInvalid: blackTheme ? _b_inputBorderColorInvalid : _w_inputBorderColorInvalid
+
+    property string buttonBackgroundColor: blackTheme ? _b_buttonBackgroundColor : _w_buttonBackgroundColor
+    property string buttonBackgroundColorHover: blackTheme ? _b_buttonBackgroundColorHover : _w_buttonBackgroundColorHover
+    property string buttonBackgroundColorDisabled: blackTheme ? _b_buttonBackgroundColorDisabled : _w_buttonBackgroundColorDisabled
+    property string buttonBackgroundColorDisabledHover: blackTheme ? _b_buttonBackgroundColorDisabledHover : _w_buttonBackgroundColorDisabledHover
+    property string buttonInlineBackgroundColor: blackTheme ? _b_buttonInlineBackgroundColor : _w_buttonInlineBackgroundColor
+    property string buttonTextColor: blackTheme ? _b_buttonTextColor : _w_buttonTextColor
+    property string buttonTextColorDisabled: blackTheme ? _b_buttonTextColorDisabled : _w_buttonTextColorDisabled
+    property string buttonSecondaryBackgroundColor: "#d9d9d9"
+    property string buttonSecondaryBackgroundColorHover: "#a6a6a6"
+    property string buttonSecondaryTextColor: "#4d4d4d"
+    property string dividerColor: blackTheme ? _b_dividerColor : _w_dividerColor
+    property real dividerOpacity: blackTheme ? _b_dividerOpacity : _w_dividerOpacity
+
+    property string titleBarBackgroundGradientStart: blackTheme ? _b_titleBarBackgroundGradientStart : _w_titleBarBackgroundGradientStart
+    property string titleBarBackgroundGradientStop: blackTheme ? _b_titleBarBackgroundGradientStop : _w_titleBarBackgroundGradientStop
+    property string titleBarBackgroundBorderColor: blackTheme ? _b_titleBarBackgroundBorderColor : _w_titleBarBackgroundBorderColor
+    property string titleBarLogoSource: blackTheme ? _b_titleBarLogoSource : _w_titleBarLogoSource
+    property string titleBarMinimizeSource: blackTheme ? _b_titleBarMinimizeSource : _w_titleBarMinimizeSource
+    property string titleBarFullscreenSource: blackTheme ? _b_titleBarFullscreenSource : _w_titleBarFullscreenSource
+    property string titleBarCloseSource: blackTheme ? _b_titleBarCloseSource : _w_titleBarCloseSource
+    property string titleBarButtonHoverColor: blackTheme ? _b_titleBarButtonHoverColor : _w_titleBarButtonHoverColor
+
+    property string wizardBackgroundGradientStart: blackTheme ? _b_wizardBackgroundGradientStart : _w_wizardBackgroundGradientStart
+    property string middlePanelBackgroundGradientStart: blackTheme ? _b_middlePanelBackgroundGradientStart : _w_middlePanelBackgroundGradientStart
+    property string middlePanelBackgroundGradientStop: blackTheme ? _b_middlePanelBackgroundGradientStop : _w_middlePanelBackgroundGradientStop
+    property string middlePanelBackgroundColor: blackTheme ? _b_middlePanelBackgroundColor : _w_middlePanelBackgroundColor
+    property string menuButtonFallbackBackgroundColor: blackTheme ? _b_menuButtonFallbackBackgroundColor : _w_menuButtonFallbackBackgroundColor
+    property string menuButtonGradientStart: blackTheme ? _b_menuButtonGradientStart : _w_menuButtonGradientStart
+    property string menuButtonGradientStop: blackTheme ? _b_menuButtonGradientStop : _w_menuButtonGradientStop
+    property string menuButtonTextColor: blackTheme ? _b_menuButtonTextColor : _w_menuButtonTextColor
+    property string menuButtonImageRightColorActive: blackTheme ? _b_menuButtonImageRightColorActive : _w_menuButtonImageRightColorActive
+    property string menuButtonImageRightColor: blackTheme ? _b_menuButtonImageRightColor : _w_menuButtonImageRightColor
+    property string menuButtonImageRightSource: blackTheme ? _b_menuButtonImageRightSource : _w_menuButtonImageRightSource
+    property string menuButtonImageDotArrowSource: blackTheme ? _b_menuButtonImageDotArrowSource : _w_menuButtonImageDotArrowSource
+    property string inlineButtonTextColor: blackTheme ? _b_inlineButtonTextColor : _w_inlineButtonTextColor
+    property string inlineButtonBorderColor: blackTheme ? _b_inlineButtonBorderColor : _w_inlineButtonBorderColor
+    property string appWindowBackgroundColor: blackTheme ? _b_appWindowBackgroundColor : _w_appWindowBackgroundColor
+    property string appWindowBorderColor: blackTheme ? _b_appWindowBorderColor : _w_appWindowBorderColor
+    property bool progressBarProgressTextBold: blackTheme ? _b_progressBarProgressTextBold : _w_progressBarProgressTextBold
+    property string progressBarBackgroundColor: blackTheme ? _b_progressBarBackgroundColor : _w_progressBarBackgroundColor
+    property string leftPanelBackgroundGradientStart: blackTheme ? _b_leftPanelBackgroundGradientStart : _w_leftPanelBackgroundGradientStart
+    property string leftPanelBackgroundGradientStop: blackTheme ? _b_leftPanelBackgroundGradientStop : _w_leftPanelBackgroundGradientStop
+    property string historyHeaderTextColor: blackTheme ? _b_historyHeaderTextColor : _w_historyHeaderTextColor
+
+    property string _b_defaultFontColor: "white"
+    property string _b_dimmedFontColor: "#BBBBBB"
+    property string _b_lightGreyFontColor: "#DFDFDF"
+    property string _b_errorColor: "#FA6800"
+    property string _b_textSelectionColor: "#BBBBBB"
+    property string _b_textSelectedColor: "white"
+
+    property string _b_inputBoxBackground: "black"
+    property string _b_inputBoxBackgroundDisabled: Qt.rgba(255, 255, 255, 0.10)
+    property string _b_inputBoxBackgroundError: "#FFDDDD"
+    property string _b_inputBoxColor: "white"
+    property string _b_legacy_placeholderFontColor: "#BABABA"
+    property string _b_inputBorderColorActive: Qt.rgba(255, 255, 255, 0.38)
+    property string _b_inputBorderColorInActive: Qt.rgba(255, 255, 255, 0.32)
+    property string _b_inputBorderColorInvalid: Qt.rgba(255, 0, 0, 0.40)
+
+    property string _b_buttonBackgroundColor: "#FA6800"
+    property string _b_buttonBackgroundColorHover: "#E65E00"
+    property string _b_buttonBackgroundColorDisabled: "#707070"
+    property string _b_buttonBackgroundColorDisabledHover: "#808080"
+    property string _b_buttonInlineBackgroundColor: "#707070"
+    property string _b_buttonTextColor: "white"
+    property string _b_buttonTextColorDisabled: "black"
+    property string _b_dividerColor: "white"
+    property real _b_dividerOpacity: 0.20
+
+    property string _b_titleBarBackgroundGradientStart: "#262626";
+    property string _b_titleBarBackgroundGradientStop: "#191919"
+    property string _b_titleBarBackgroundBorderColor: "#2f2f2f"
+    property string _b_titleBarLogoSource: "qrc:///images/titlebarLogo.png"
+    property string _b_titleBarMinimizeSource: "qrc:///images/minimize.svg"
+    property string _b_titleBarFullscreenSource: "qrc:///images/fullscreen.svg"
+    property string _b_titleBarCloseSource: "qrc:///images/close.svg"
+    property string _b_titleBarButtonHoverColor: "#10FFFFFF"
+
+    property string _b_wizardBackgroundGradientStart: "#1e1e1e"
+    property string _b_middlePanelBackgroundGradientStart: "#232323"
+    property string _b_middlePanelBackgroundGradientStop: "#101010"
+    property string _b_middlePanelBackgroundColor: "#181818"
+    property string _b_menuButtonFallbackBackgroundColor: "#09FFFFFF"
+    property string _b_menuButtonGradientStart: "#11FFFFFF"
+    property string _b_menuButtonGradientStop: "#00000000"
+    property string _b_menuButtonTextColor: "white"
+    property string _b_menuButtonImageRightColorActive: "white"
+    property string _b_menuButtonImageRightColor: "white"
+    property string _b_menuButtonImageRightSource: "qrc:///images/right.svg"
+    property string _b_menuButtonImageDotArrowSource: "qrc:///images/arrow-right-medium-white.png"
+    property string _b_inlineButtonTextColor: "white"
+    property string _b_inlineButtonBorderColor: "black"
+    property string _b_appWindowBackgroundColor: "white"
+    property string _b_appWindowBorderColor: "#313131"
+    property bool _b_progressBarProgressTextBold: true
+    property string _b_progressBarBackgroundColor: "#24FFFFFF"
+    property string _b_leftPanelBackgroundGradientStart: "#222222"
+    property string _b_leftPanelBackgroundGradientStop: "#1a1a1a"
+    property string _b_historyHeaderTextColor: "#C0C0C0"
+
+    property string _w_defaultFontColor: "black"
+    property string _w_dimmedFontColor: "#3f3f3f"
+    property string _w_lightGreyFontColor: "#515151"
+    property string _w_errorColor: "#FA6800"
+    property string _w_textSelectionColor: "#BBBBBB"
+    property string _w_textSelectedColor: "black"
+
+    property string _w_inputBoxBackground: "white"
+    property string _w_inputBoxBackgroundDisabled: Qt.rgba(0, 0, 0, 0.20)
+    property string _w_inputBoxBackgroundError: "#FFDDDD"
+    property string _w_inputBoxColor: "black"
+    property string _w_legacy_placeholderFontColor: "#BABABA"
+    property string _w_inputBorderColorActive: Qt.rgba(0, 0, 0, 0.30)
+    property string _w_inputBorderColorInActive: Qt.rgba(0, 0, 0, 0.16)
+    property string _w_inputBorderColorInvalid: Qt.rgba(255, 0, 0, 0.50)
+
+    property string _w_buttonBackgroundColor: "#FA6800"
+    property string _w_buttonBackgroundColorHover: "#E65E00"
+    property string _w_buttonBackgroundColorDisabled: "#bbbbbb"
+    property string _w_buttonBackgroundColorDisabledHover: "#D1D1D1"
+    property string _w_buttonInlineBackgroundColor: "#bbbbbb"
+    property string _w_buttonTextColor: "white"
+    property string _w_buttonTextColorDisabled: "black"
+    property string _w_dividerColor: "black"
+    property real _w_dividerOpacity: 0.20
+
+    property string _w_titleBarBackgroundGradientStart: "#fcfcfc"
+    property string _w_titleBarBackgroundGradientStop: "#FBFBFB"
+    property string _w_titleBarBackgroundBorderColor: "#DEDEDE"
+    property string _w_titleBarLogoSource: "qrc:///images/themes/white/titlebarLogo.png"
+    property string _w_titleBarMinimizeSource: "qrc:///images/themes/white/minimize.svg"
+    property string _w_titleBarFullscreenSource: "qrc:///images/themes/white/fullscreen.svg"
+    property string _w_titleBarCloseSource: "qrc:///images/themes/white/close.svg"
+    property string _w_titleBarButtonHoverColor: "#11000000"
+
+    property string _w_wizardBackgroundGradientStart: "white"
+    property string _w_middlePanelBackgroundGradientStart: "white"
+    property string _w_middlePanelBackgroundGradientStop: "#ededed"
+    property string _w_middlePanelBackgroundColor: "#f5f5f5"
+    property string _w_menuButtonFallbackBackgroundColor: "#09000000"
+    property string _w_menuButtonGradientStart: "#08000000"
+    property string _w_menuButtonGradientStop: "#10FFFFFF"
+    property string _w_menuButtonTextColor: "#787878"
+    property string _w_menuButtonImageRightSource: "qrc:///images/right.svg"
+    property string _w_menuButtonImageRightColorActive: "#FA6800"
+    property string _w_menuButtonImageRightColor: "#808080"
+    property string _w_menuButtonImageDotArrowSource: "qrc:///images/arrow-right-medium-white.png"
+    property string _w_inlineButtonTextColor: "black"
+    property string _w_inlineButtonBorderColor: "transparent"
+    property string _w_appWindowBackgroundColor: "black"
+    property string _w_appWindowBorderColor: "#dedede"
+    property bool _w_progressBarProgressTextBold: false
+    property string _w_progressBarBackgroundColor: "#24000000"
+    property string _w_leftPanelBackgroundGradientStart: "white"
+    property string _w_leftPanelBackgroundGradientStop: "#f5f5f5"
+    property string _w_historyHeaderTextColor: "#515151"
 }

components/SuccessfulTxDialog.qml

@@ -0,0 +1,191 @@
+// 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
+    focus: true
+    Keys.enabled: true
+    Keys.onEscapePressed: {
+        root.close()
+        root.rejected()
+    }
+    Keys.onEnterPressed: {
+        root.close()
+        root.accepted()
+    }
+    Keys.onReturnPressed: {
+        root.close()
+        root.accepted()
+    }
+    KeyNavigation.tab: doneButton
+
+    Clipboard { id: clipboard }
+
+    property var transactionID;
+
+    // same signals as Dialog has
+    signal accepted()
+    signal rejected()
+
+    function open(txid) {
+        root.transactionID = txid;
+        root.visible = true;
+        root.forceActiveFocus();
+    }
+
+    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
+                Keys.enabled: openFolderButton.visible
+                Keys.onReturnPressed: openFolderButton.onClicked
+                Keys.onEnterPressed: openFolderButton.onClicked
+                Keys.onEscapePressed: {
+                    root.close()
+                    root.rejected()
+                }
+                onClicked: {
+                    oshelper.openContainingFolder(walletManager.urlToLocalPath(saveTxDialog.fileUrl))
+                }
+            }
+
+            MoneroComponents.StandardButton {
+                id: doneButton
+                text: qsTr("Done") + translationManager.emptyString;
+                width: 200
+                focus: true
+                KeyNavigation.tab: openFolderButton
+                Keys.enabled: doneButton.visible
+                Keys.onReturnPressed: doneButton.onClicked
+                Keys.onEnterPressed: doneButton.onClicked
+                Keys.onEscapePressed: {
+                    root.close()
+                    root.rejected()
+                }
+                onClicked: {
+                    root.close()
+                    root.accepted()
+                }
+            }
+        }
+    }
+}

components/TableDropdown.qml

@@ -1,237 +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.0
-
-Item {
-    id: dropdown
-    property bool expanded: false
-    property alias dataModel: repeater.model
-    signal collapsed()
-    signal optionClicked(int option)
-    width: 72
-    height: 37
-
-    onExpandedChanged: if(expanded) appWindow.currentItem = dropdown
-    function hide() { dropdown.expanded = false }
-    function containsPoint(px, py) {
-        if(px < 0)
-            return false
-        if(px > width)
-            return false
-        if(py < 0)
-            return false
-        if(py > height + dropArea.height)
-            return false
-        return true
-    }
-
-    Item {
-        id: head
-        anchors.fill: parent
-
-        Rectangle {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            height: parent.height - 1
-            y: dropdown.expanded || dropArea.height > 0 ? 0 : 1
-            //radius: 3
-            color: dropdown.expanded || dropArea.height > 0 ? "#888888" : "#DBDBDB"
-        }
-
-        Rectangle {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            height: parent.height - 1
-            y: dropdown.expanded || dropArea.height > 0 ? 1 : 0
-            //radius: 3
-            color: dropdown.expanded || dropArea.height > 0 ? "#DBDBDB" : "#F0EEEE"
-        }
-
-        Rectangle {
-            anchors.left: parent.left
-            anchors.bottom: parent.bottom
-            height: 3
-            width: 3
-            color: "#DBDBDB"
-            visible: dropdown.expanded || dropArea.height > 0
-        }
-
-        Rectangle {
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            height: 3
-            width: 3
-            color: "#DBDBDB"
-            visible: dropdown.expanded || dropArea.height > 0
-        }
-
-        Image {
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: parent.left
-            anchors.leftMargin: 10
-            source: "../images/tableOptions.png"
-        }
-
-        Rectangle {
-            anchors.centerIn: parent
-            anchors.horizontalCenterOffset: 1
-            height: 23
-            width: 1
-            color: dropdown.expanded || dropArea.height > 0 ? "#FFFFFF" : "#DBDBDB"
-        }
-
-        Image {
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.right: parent.right
-            anchors.rightMargin: 10
-            source: "../images/dropIndicator.png"
-        }
-    }
-
-    Timer {
-        id: timer
-        interval: 50
-        repeat: true
-        running: false
-        onTriggered: {
-            if(((appWindow.toolTip.visible && !appWindow.toolTip.containsMouse) || !appWindow.toolTip.visible) && !mouseArea.containsMouse) {
-                appWindow.toolTip.visible = false
-                dropdown.expanded = false
-                currentIndex = -1
-                timer.stop()
-            }
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.left: head.left
-        anchors.right: head.right
-        anchors.top: head.top
-        height: head.height + dropArea.height
-        hoverEnabled: true
-        onEntered: dropdown.expanded = true
-
-        property int currentIndex: -1
-        onMouseYChanged: {
-            if(mouseY > head.height) {
-                var posY = parseInt((mouseY - head.height) / 30)
-                currentIndex = posY
-            } else {
-                currentIndex = -1
-            }
-        }
-
-        onClicked: {
-            optionClicked(currentIndex)
-        }
-
-        onExited: timer.start()
-        preventStealing: true
-        z: 1
-
-        Item {
-            id: dropArea
-            anchors.left: parent.left
-            anchors.right: parent.right
-            y: head.height
-            height: dropdown.expanded ? column.height : 0
-            onHeightChanged: if(height === 0) dropdown.collapsed()
-            clip: true
-
-            Behavior on height {
-                NumberAnimation { duration: 100; easing.type: Easing.InQuad }
-            }
-
-            Column {
-                id: column
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-
-                Repeater {
-                    id: repeater
-
-                    // Workaround for translations in listElements. All translated strings needs to be listed in this file.
-                    property string stringCopy: qsTr("<b>Copy address to clipboard</b>") + translationManager.emptyString
-                    property string stringSend: qsTr("<b>Send to this address</b>") + translationManager.emptyString
-                    property string stringFind: qsTr("<b>Find similar transactions</b>") + translationManager.emptyString
-                    property string stringRemove: qsTr("<b>Remove from address book</b>") + translationManager.emptyString
-
-                    delegate: Rectangle {
-                        id: delegate
-                        property bool containsMouse: index === mouseArea.currentIndex
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        height: 30
-                        color: containsMouse ? "#F0EEEE" : "#DBDBDB"
-                        //radius: index === repeater.count - 1 ? 5 : 0
-                        Rectangle {
-                            anchors.left: parent.left
-                            anchors.top: parent.top
-                            width: 5
-                            height: 5
-                            color: delegate.color
-                        }
-
-                        Rectangle {
-                            anchors.right: parent.right
-                            anchors.top: parent.top
-                            width: 5
-                            height: 5
-                            color: delegate.color
-                        }
-
-                        Image {
-                            anchors.verticalCenter: parent.verticalCenter
-                            anchors.left: parent.left
-                            anchors.leftMargin: 10
-                            source: icon
-                        }
-
-                        onContainsMouseChanged: {
-                            if(containsMouse) {
-                                var pos = rootItem.mapFromItem(delegate, 30, -25)
-                                appWindow.toolTip.text = qsTr(name) + translationManager.emptyString
-                                appWindow.toolTip.x = pos.x - appWindow.toolTip.width
-//                                if(appWindow.toolTip.height > 30)
-//                                    pos.y -= appWindow.toolTip.height - 30
-                                appWindow.toolTip.y = pos.y
-                                appWindow.toolTip.visible = true
-                                appWindow.toolTip.z = 3
-
-                            }
-                        }
-
-                    }
-                }
-            }
-        }
-    }
-}

components/TableHeader.qml

@@ -1,202 +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.0
-
-Rectangle {
-    id: header
-    signal sortRequest(bool desc, int column)
-    property alias dataModel: columnsRepeater.model
-    property int activeSortColumn: -1
-    property int offset: 0
-
-    height: 31
-    color: "transparent"
-
-    Rectangle{
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        width: 1
-        color: "#808080"
-    }
-
-    Rectangle{
-        anchors.left: parent.left
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        width: 1
-        color: "#808080"
-    }
-
-    Rectangle {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        height: 1
-        color: "#808080"
-    }
-
-    Row {
-        id: row
-        anchors.horizontalCenter: parent.horizontalCenter
-
-        Rectangle {
-            height: 31
-            width: 1
-            color: "#808080"
-        }
-
-        Repeater {
-            id: columnsRepeater
-
-            // Workaround for translations in listElements. All translated strings needs to be listed in this file.
-            property string stringPaymentID: qsTr("Payment ID") + translationManager.emptyString
-            property string stringDate: qsTr("Date") + translationManager.emptyString
-            property string stringBlockHeight: qsTr("Block height") + translationManager.emptyString
-            property string stringAmount: qsTr("Amount") + translationManager.emptyString
-
-            delegate: Rectangle {
-                id: delegate
-                property bool desc: false
-                color: "transparent"
-                height: 31
-                width: columnWidth
-
-                Text {
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.verticalCenterOffset: -2
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    anchors.leftMargin: 13
-                    anchors.rightMargin: 13
-                    elide: Text.ElideRight
-                    font.family: "Arial"
-                    font.pixelSize: 14
-                    color: {
-                        if(delegateArea.pressed)
-                            return "#FF4304"
-                        return index === header.activeSortColumn || delegateArea.containsMouse ? "white" : "#808080"
-                    }
-                    text: qsTr(columnName) + translationManager.emptyString
-                }
-
-                MouseArea {
-                    id: delegateArea
-                    hoverEnabled: true
-                    anchors.fill: parent
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        delegate.desc = !delegate.desc
-                        header.activeSortColumn = index
-                        header.sortRequest(delegate.desc, index)
-                    }
-                }
-
-                Row {
-                    anchors.right: parent.right
-                    anchors.top: parent.top
-                    anchors.bottom: parent.bottom
-                    anchors.rightMargin: 9
-
-                    Item {
-                        width: 14
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
-
-                        Image {
-                            anchors.centerIn: parent
-                            anchors.verticalCenterOffset: -2
-                            source: {
-                                if(descArea.pressed)
-                                    return "../images/descSortIndicatorPressed.png"
-                                return index === header.activeSortColumn || descArea.containsMouse ? "../images/descSortIndicatorActived.png" :
-                                                                                                     "../images/descSortIndicator.png"
-                            }
-                        }
-
-                        MouseArea {
-                            id: descArea
-                            hoverEnabled: true
-                            anchors.fill: parent
-                            onClicked: {
-                                delegate.desc = true
-                                header.activeSortColumn = index
-                                header.sortRequest(delegate.desc, index)
-                            }
-                        }
-                    }
-
-                    Item {
-                        width: 14
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
-
-                        Image {
-                            anchors.centerIn: parent
-                            anchors.verticalCenterOffset: -3
-                            source: {
-                                if(ascArea.pressed)
-                                    return "../images/ascSortIndicatorPressed.png"
-                                return index === header.activeSortColumn || ascArea.containsMouse ? "../images/ascSortIndicatorActived.png" :
-                                                                                                    "../images/ascSortIndicator.png"
-                            }
-                        }
-
-                        MouseArea {
-                            id: ascArea
-                            hoverEnabled: true
-                            anchors.fill: parent
-                            onClicked: {
-                                delegate.desc = false
-                                header.activeSortColumn = index
-                                header.sortRequest(delegate.desc, index)
-                            }
-                        }
-                    }
-                }
-
-                Rectangle {
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    anchors.bottom: parent.bottom
-                    height: 1
-                    color: "transparent"
-                }
-
-                Rectangle {
-                    anchors.top: parent.top
-                    anchors.bottom: parent.bottom
-                    anchors.right: parent.right
-                    width: 1
-                    color: "#808080"
-                }
-            }
-        }
-    }
-}

components/TextBlock.qml

@@ -1,11 +1,11 @@
-import QtQuick 2.0
+import QtQuick 2.9
 
 import "../components" as MoneroComponents
 
 TextEdit {
     color: MoneroComponents.Style.defaultFontColor
     font.family: MoneroComponents.Style.fontRegular.name
-    selectionColor: MoneroComponents.Style.dimmedFontColor
+    selectionColor: MoneroComponents.Style.textSelectionColor
     wrapMode: Text.Wrap
     readOnly: true
     selectByMouse: true

components/TextPlain.qml

@@ -0,0 +1,28 @@
+import QtQuick 2.9
+
+import "." as MoneroComponents
+import "effects/" as MoneroEffects
+
+Text {
+    // When using this component, please note that if you use a color different
+    // than `defaultFontColor`, you are required to also define `themeTransitionXColor`.
+    // If you do not set these the component will receive the wrong color after a transition.
+    // If you do not want to set these, use `themeTransition: false`.
+    id: root
+    property bool themeTransition: true
+    property string themeTransitionBlackColor: ""
+    property string themeTransitionWhiteColor: ""
+    font.family: MoneroComponents.Style.fontMedium.name
+    font.bold: false
+    font.pixelSize: 14
+    textFormat: Text.PlainText
+
+    MoneroEffects.ColorTransition {
+        enabled: root.themeTransition
+        themeTransition: root.themeTransition
+        targetObj: root
+        duration: 750
+        blackColor: root.themeTransitionBlackColor !== "" ? root.themeTransitionBlackColor : MoneroComponents.Style._b_defaultFontColor
+        whiteColor: root.themeTransitionWhiteColor !== "" ? root.themeTransitionWhiteColor : MoneroComponents.Style._w_defaultFontColor
+    }
+}

components/TextPlainArea.qml

@@ -0,0 +1,48 @@
+import QtQuick 2.9
+import QtQuick.Controls 2.0
+
+import "." as MoneroComponents
+
+TextArea {
+    id: textArea
+    property bool themeTransition: true
+    property string colorWhiteTheme: ""
+    property string colorBlackTheme: ""
+    color: MoneroComponents.Style.defaultFontColor
+    font.family: MoneroComponents.Style.fontRegular.name
+    font.pixelSize: 14
+    selectByMouse: false
+    wrapMode: Text.WordWrap;
+    textMargin: 0
+    leftPadding: 0
+    topPadding: 0
+    readOnly: true
+    textFormat: TextEdit.PlainText
+
+    states: [
+        State {
+            name: "black";
+            when: textArea.themeTransition && MoneroComponents.Style.blackTheme
+            PropertyChanges {
+                target: textArea
+                color: {
+                    return textArea.colorBlackTheme ? textArea.colorBlackTheme : MoneroComponents.Style._b_defaultFontColor
+                }
+            }
+        }, State {
+            name: "white";
+            when: textArea.themeTransition && !MoneroComponents.Style.blackTheme
+            PropertyChanges {
+                target: textArea
+                color: {
+                    return textArea.colorWhiteTheme ? textArea.colorWhiteTheme : MoneroComponents.Style._w_defaultFontColor
+                }
+            }
+        }
+    ]
+
+    transitions: Transition {
+        enabled: appWindow.themeTransition
+        ColorAnimation { properties: "color"; easing.type: Easing.InOutQuad; duration: 750 }
+    }
+}

components/TipItem.qml

@@ -26,9 +26,11 @@
 // 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.2
+import QtQuick 2.9
 import QtQuick.Window 2.1
 
+import "../components" as MoneroComponents
+
 Window {
     property alias text: content.text
     property alias containsMouse: tipArea.containsMouse
@@ -55,10 +57,10 @@ Window {
             anchors.top: parent.bottom
             anchors.left: parent.left
             anchors.leftMargin: 5
-            source: "../images/tip.png"
+            source: "qrc:///images/tip.png"
         }
 
-        Text {
+        MoneroComponents.TextPlain {
             id: content
             anchors.horizontalCenter: parent.horizontalCenter
             y: 6

components/TitleBar.qml

@@ -26,219 +26,337 @@
 // 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.5
+import QtQuick 2.9
 import QtQuick.Window 2.0
-import QtQuick.Layouts 1.1
+import QtGraphicalEffects 1.0
+import QtQuick.Layouts 1.2
+
+import FontAwesome 1.0
+import "." as MoneroComponents
+import "effects/" as MoneroEffects
 
 Rectangle {
-    id: titleBar
+    id: root
+    property int mouseX: 0
+    property bool customDecorations: persistentSettings.customDecorations
+    property bool showMinimizeButton: true
+    property bool showMaximizeButton: true
+    property bool showCloseButton: true
+    property string walletName: ""
 
     height: {
-        if(!customDecorations || isMobile){
-            return 0;
-        }
-
-        if(small) return 38 * scaleRatio;
-        else return 50 * scaleRatio;
+        if(!persistentSettings.customDecorations) return 0;
+        return 50;
     }
-    y: -height
-    z: 1
 
-    property string title
-    property int mouseX: 0
-    property bool containsMouse: false
-    property alias basicButtonVisible: goToBasicVersionButton.visible
-    property bool customDecorations: persistentSettings.customDecorations
-    property bool showWhatIsButton: true
-    property bool showMinimizeButton: false
-    property bool showMaximizeButton: false
-    property bool showCloseButton: true
-    property bool showMoneroLogo: false
-    property bool small: false
+    z: 1
+    color: "transparent"
 
     signal closeClicked
     signal maximizeClicked
     signal minimizeClicked
-    signal goToBasicVersion(bool yes)
+    signal languageClicked
+    signal closeWalletClicked
 
-    Item {
-        // Background gradient
-        width: parent.width
-        height: parent.height
-        z: parent.z + 1
-
-        Image {
-           anchors.fill: titleBar
-           height: titleBar.height
-           width: titleBar.width
-           source: "../images/titlebarGradient.jpg"
+    state: "default"
+    states: [
+        State {
+            name: "default";
+            PropertyChanges { target: btnCloseWallet; visible: true}
+            PropertyChanges { target: btnLanguageToggle; visible: true}
+        }, State {
+            // show only theme switcher and window controls
+            name: "essentials";
+            PropertyChanges { target: btnCloseWallet; visible: false}
+            PropertyChanges { target: btnLanguageToggle; visible: false}
         }
+    ]
+
+    MoneroEffects.GradientBackground {
+        anchors.fill: parent
+        duration: 300
+        fallBackColor: MoneroComponents.Style.middlePanelBackgroundColor
+        initialStartColor: MoneroComponents.Style.titleBarBackgroundGradientStart
+        initialStopColor: MoneroComponents.Style.titleBarBackgroundGradientStop
+        blackColorStart: MoneroComponents.Style._b_titleBarBackgroundGradientStart
+        blackColorStop: MoneroComponents.Style._b_titleBarBackgroundGradientStop
+        whiteColorStart: MoneroComponents.Style._w_titleBarBackgroundGradientStart
+        whiteColorStop: MoneroComponents.Style._w_titleBarBackgroundGradientStop
+        start: Qt.point(width, 0)
+        end: Qt.point(0, 0)
     }
 
-    Item {
-        id: titlebarlogo
-        width: 125
-        height: parent.height
-        anchors.centerIn: parent
-        visible: customDecorations && showMoneroLogo
-        z: parent.z + 1
-
-        Image {
-            anchors.left: parent.left
-            anchors.top: parent.top
-            anchors.topMargin: 11
-            width: 125
-            height: 28
-            source: "../images/titlebarLogo.png"
-        }
-    }
-
-    Label {
-        id: titleLabel
-        visible: !showMoneroLogo && customDecorations && titleBar.title !== ''
-        anchors.centerIn: parent
-        fontSize: 18
-        text: titleBar.title
-        z: parent.z + 1
-    }
-
-    // collapse left panel
-    Rectangle {
-        id: goToBasicVersionButton
-        property bool containsMouse: titleBar.mouseX >= x && titleBar.mouseX <= x + width
-        property bool checked: false
-        anchors.top: parent.top
-        anchors.left: parent.left
-        color:  "transparent"
-        height: titleBar.height
-        width: height
-        visible: isMobile
-        z: parent.z + 2
-
-        Image {
-            width: 14
-            height: 14
-            anchors.centerIn: parent
-            source: "../images/expand.png"
-        }
-
-        MouseArea {
-            id: basicMouseArea
-            hoverEnabled: true
-            anchors.fill: parent
-            cursorShape: Qt.PointingHandCursor
-            onEntered: goToBasicVersionButton.color = "#262626";
-            onExited: goToBasicVersionButton.color = "transparent";
-            onClicked: {
-                releaseFocus()
-                parent.checked = !parent.checked
-                titleBar.goToBasicVersion(leftPanel.visible)
-            }
-        }
-    }
-
-    Row {
-        id: row
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        visible: parent.customDecorations
+    RowLayout {
         z: parent.z + 2
+        spacing: 0
+        anchors.fill: parent
 
+        // collapse sidebar
         Rectangle {
-            id: minimizeButton
-            visible: showMinimizeButton
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            width: 42
+            id: btnCloseWallet
             color: "transparent"
+            Layout.preferredWidth: parent.height
+            Layout.preferredHeight: parent.height
 
-            Image {
-                anchors.centerIn: parent
-                source: "../images/minimize.png"
+
+            Text {
+                text: FontAwesome.signOutAlt
+                font.family: FontAwesome.fontFamilySolid
+                font.pixelSize: 16
+                color: MoneroComponents.Style.defaultFontColor
+                font.styleName: "Solid"
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                opacity: 0.75
             }
 
             MouseArea {
-                id: minimizeArea
                 anchors.fill: parent
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
-                onEntered: minimizeButton.color = "#262626";
-                onExited: minimizeButton.color = "transparent";
-                onClicked: minimizeClicked();
+                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                onExited: parent.color = "transparent"
+                onClicked: root.closeWalletClicked(leftPanel.visible)
             }
         }
 
+        // language selection
         Rectangle {
-            id: maximizeButton
-            visible: showMaximizeButton
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            width: 42
-            color: "transparent";
+            id: btnLanguageToggle
+            color: "transparent"
+            Layout.preferredWidth: parent.height
+            Layout.preferredHeight: parent.height
 
-            Image {
-                anchors.centerIn: parent
-                height: 16
-                width: 16
-                source: appWindow.visibility === Window.FullScreen ?  "../images/backToWindowIcon.png" :
-                                                                      "../images/fullscreen.png"
+            Text {
+                text: FontAwesome.globe
+                font.family: FontAwesome.fontFamilySolid
+                font.pixelSize: 16
+                color: MoneroComponents.Style.defaultFontColor
+                font.styleName: "Solid"
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                opacity: 0.75
             }
 
             MouseArea {
-                id: maximizeArea
                 anchors.fill: parent
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
-                onEntered: maximizeButton.color = "#262626";
-                onExited: maximizeButton.color = "transparent";
-                onClicked: maximizeClicked();
+                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                onExited: parent.color = "transparent"
+                onClicked: root.languageClicked()
             }
         }
 
+        // switch theme
         Rectangle {
-            id: closeButton
-            visible: showCloseButton
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            width: 42
-            color: containsMouse ? "#E04343" : "#00000000"
+            color: "transparent"
+            Layout.preferredWidth: parent.height
+            Layout.preferredHeight: parent.height
 
-            Image {
-                anchors.centerIn: parent
-                width: 16
-                height: 16
-                source: "../images/close.png"
+            Text {
+                text: FontAwesome.moonO
+                font.family: MoneroComponents.Style.blackTheme ? FontAwesome.fontFamilySolid : FontAwesome.fontFamily
+                font.styleName: MoneroComponents.Style.blackTheme ? "Solid" : "Regular"
+                font.pixelSize: 15
+                color: MoneroComponents.Style.defaultFontColor
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                opacity: 0.75
             }
 
             MouseArea {
                 anchors.fill: parent
-                onClicked: closeClicked();
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
-                onEntered: closeButton.color = "#262626";
-                onExited: closeButton.color = "transparent";
+                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                onExited: parent.color = "transparent"
+                onClicked: {
+                    MoneroComponents.Style.blackTheme = !MoneroComponents.Style.blackTheme;
+                    persistentSettings.blackTheme = MoneroComponents.Style.blackTheme;
+                }
+            }
+        }
+
+        Item {
+            // make dummy space when hiding buttons when titlebar
+            // state is 'essentials' in order for the
+            // monero logo to still be centered
+            Layout.preferredWidth: parent.height * 2  // amount of buttons we hide
+            Layout.preferredHeight: parent.height
+            visible: root.state == "essentials"
+        }
+
+        // monero logo
+        Item {
+            visible: walletName.length === 0
+            Layout.fillWidth: true
+            Layout.preferredHeight: parent.height
+
+            Image {
+                id: imgLogo
+                width: 125
+                height: 28
+
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.verticalCenter: parent.verticalCenter
+
+                source: MoneroComponents.Style.titleBarLogoSource
+                visible: {
+                    if(!isOpenGL) return true;
+                    if(!MoneroComponents.Style.blackTheme) return true;
+                    return false;
+                }
+            }
+
+            Colorize {
+                visible: isOpenGL && MoneroComponents.Style.blackTheme
+                anchors.fill: imgLogo
+                source: imgLogo
+                saturation: 0.0
+            }
+        }
+
+        Item {
+            visible: walletName.length > 0
+            Layout.fillWidth: true
+            Layout.preferredHeight: parent.height
+
+            MoneroComponents.TextPlain {
+                font.pixelSize: 20
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                width: parent.width
+                height: parent.height
+                elide: Text.ElideRight
+                text: walletName
+            }
+        }
+
+        // minimize
+        Rectangle {
+            color: "transparent"
+            visible: root.showMinimizeButton
+            Layout.preferredWidth: parent.height
+            Layout.preferredHeight: parent.height
+
+            MoneroEffects.ImageMask {
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: 18
+                anchors.horizontalCenter: parent.horizontalCenter
+                height: 3
+                width: 15
+                image: MoneroComponents.Style.titleBarMinimizeSource
+                color: MoneroComponents.Style.defaultFontColor
+                fontAwesomeFallbackIcon: FontAwesome.minus
+                fontAwesomeFallbackSize: 18
+                fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 0.8 : 0.6
+                opacity: 0.75
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                onExited: parent.color = "transparent"
+                onClicked: root.minimizeClicked();
+            }
+        }
+
+        // maximize
+        Rectangle {
+            id: test
+            visible: root.showMaximizeButton
+            color: "transparent"
+            Layout.preferredWidth: parent.height
+            Layout.preferredHeight: parent.height
+
+            Image {
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                source: MoneroComponents.Style.titleBarFullscreenSource
+                sourceSize.width: 16
+                sourceSize.height: 16
+                smooth: true
+                mipmap: true
+                opacity: 0.75
+                rotation: appWindow.visibility === Window.FullScreen ? 180 : 0
+            }
+
+            MouseArea {
+                id: buttonArea
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                onExited: parent.color = "transparent"
+                onClicked: root.maximizeClicked();
+            }
+        }
+
+        // close
+        Rectangle {
+            visible: root.showCloseButton
+            color: "transparent"
+            Layout.preferredWidth: parent.height
+            Layout.preferredHeight: parent.height
+
+            MoneroEffects.ImageMask {
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                height: 16
+                width: 16
+                image: MoneroComponents.Style.titleBarCloseSource
+                color: MoneroComponents.Style.defaultFontColor
+                fontAwesomeFallbackIcon: FontAwesome.times
+                fontAwesomeFallbackSize: 21
+                fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 0.8 : 0.6
+                opacity: 0.75
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
+                onExited: parent.color = "transparent"
+                onClicked: root.closeClicked();
             }
         }
     }
 
-    // window borders
     Rectangle {
+        z: parent.z + 3
         anchors.bottom: parent.bottom
-        anchors.right: parent.right
         anchors.left: parent.left
-        height: 1
-        color: "#2F2F2F"
-        z: parent.z + 1
+        anchors.right: parent.right
+        height: MoneroComponents.Style.blackTheme ? 1 : 1
+        color: MoneroComponents.Style.titleBarBackgroundBorderColor
+
+        MoneroEffects.ColorTransition {
+            targetObj: parent
+            blackColor: MoneroComponents.Style._b_titleBarBackgroundBorderColor
+            whiteColor: MoneroComponents.Style._w_titleBarBackgroundBorderColor
+        }
     }
 
-    Rectangle {
-        anchors.top: parent.top
-        anchors.right: parent.right
-        anchors.left: parent.left
-        visible: titleBar.small
-        height: 1
-        color: "#2F2F2F"
-        z: parent.z + 1
+    MouseArea {
+        enabled: persistentSettings.customDecorations
+        property var previousPosition
+        anchors.fill: parent
+        propagateComposedEvents: true
+        onPressed: previousPosition = globalCursor.getPosition()
+        onPositionChanged: {
+            if (pressedButtons == Qt.LeftButton) {
+                var pos = globalCursor.getPosition()
+                var dx = pos.x - previousPosition.x
+                var dy = pos.y - previousPosition.y
+
+                appWindow.x += dx
+                appWindow.y += dy
+                previousPosition = pos
+            }
+        }
     }
 }

components/TxConfirmationDialog.qml

@@ -0,0 +1,466 @@
+// 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
+import QtQuick.Layouts 1.1
+
+import "../components" as MoneroComponents
+import FontAwesome 1.0
+
+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
+    focus: true
+    Keys.enabled: true
+    Keys.onEscapePressed: {
+        root.close()
+        root.clearFields()
+        root.rejected()
+    }
+    Keys.onEnterPressed: {
+         if (root.state == "default") {
+             root.close()
+             root.accepted()
+         } else if (root.state == "error") {
+             root.close()
+             root.clearFields()
+             root.rejected()
+         }
+    }
+    Keys.onReturnPressed: {
+         if (root.state == "default") {
+             root.close()
+             root.accepted()
+         } else if (root.state == "error") {
+             root.close()
+             root.clearFields()
+             root.rejected()
+         }
+    }
+    KeyNavigation.tab: confirmButton
+
+    property var transactionAmount: ""
+    property var transactionAddress: ""
+    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 }
+        }, 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 }
+            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 = "";
+        root.forceActiveFocus()
+    }
+
+    function close() {
+        root.visible = false;
+    }
+
+    function clearFields() {
+        root.transactionAmount = "";
+        root.transactionAddress = "";
+        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 {
+        spacing: 10
+        anchors.fill: parent
+        anchors.margins: 25
+
+        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
+
+            BusyIndicator {
+                  id: txAmountBusyIndicator
+                  Layout.fillWidth: true
+                  Layout.alignment : Qt.AlignTop | Qt.AlignLeft
+                  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
+
+            ColumnLayout {
+                Layout.fillWidth: true
+                Layout.alignment : Qt.AlignTop | Qt.AlignLeft
+
+                Text {
+                    Layout.fillWidth: true
+                    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 "";
+                        }
+                    }
+                }
+            }
+
+            ColumnLayout {
+                Layout.fillWidth: true
+                Layout.alignment : Qt.AlignTop | Qt.AlignLeft
+
+                Text {
+                    Layout.fillWidth: true
+                    font.pixelSize: 15
+                    color: MoneroComponents.Style.dimmedFontColor
+                    text: qsTr("To") + ":" + translationManager.emptyString
+                }
+            }
+
+            ColumnLayout {
+                Layout.fillWidth: true
+                spacing: 16
+
+                Text {
+                    Layout.fillWidth: true
+                    font.pixelSize: 15
+                    font.family: MoneroComponents.Style.fontRegular.name
+                    textFormat: Text.RichText
+                    wrapMode: Text.Wrap
+                    color: MoneroComponents.Style.defaultFontColor
+                    text: {
+                        if (root.transactionAddress) {
+                            const addressBookName = currentWallet ? currentWallet.addressBook.getDescription(root.transactionAddress) : null;
+                            var fulladdress = root.transactionAddress;
+                            var spacedaddress = fulladdress.match(/.{1,4}/g);
+                            var spacedaddress = spacedaddress.join(' ');
+                            if (!addressBookName) {
+                                return qsTr("Monero address") + "<br>" + spacedaddress + translationManager.emptyString; 
+                            } else {
+                                return FontAwesome.addressBook + " " + addressBookName + "<br>" + spacedaddress;
+                            }
+                        } else {
+                            return "";
+                        }
+                    }
+                }
+            }
+
+            ColumnLayout {
+                Layout.fillWidth: true
+                Layout.alignment : Qt.AlignTop | Qt.AlignLeft
+
+                Text {
+                    Layout.fillWidth: true
+                    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
+
+                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
+                    focus: false
+                    primary: false
+                    KeyNavigation.tab: confirmButton
+                    Keys.enabled: backButton.visible
+                    Keys.onReturnPressed: backButton.onClicked
+                    Keys.onEnterPressed: backButton.onClicked
+                    Keys.onEscapePressed: {
+                        root.close()
+                        root.clearFields()
+                        root.rejected()
+                    }
+                    onClicked: {
+                        root.close()
+                        root.clearFields()
+                        root.rejected()
+                    }
+                }
+
+                MoneroComponents.StandardButton {
+                    id: confirmButton
+                    text: qsTr("Confirm") + translationManager.emptyString;
+                    rightIcon: "qrc:///images/rightArrow.png"
+                    width: 200
+                    focus: false
+                    KeyNavigation.tab: backButton
+                    Keys.enabled: confirmButton.visible
+                    Keys.onReturnPressed: confirmButton.onClicked
+                    Keys.onEnterPressed: confirmButton.onClicked
+                    Keys.onEscapePressed: {
+                        root.close()
+                        root.clearFields()
+                        root.rejected()
+                    }
+                    onClicked: {
+                        root.close()
+                        root.accepted()
+                    }
+                }
+            }
+        }
+    }
+}

components/UpdateDialog.qml

@@ -0,0 +1,204 @@
+// 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.
+
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.1
+
+import moneroComponents.Downloader 1.0
+
+import "../components" as MoneroComponents
+
+Popup {
+    id: updateDialog
+
+    property bool active: false
+    property bool allowed: true
+    property string error: ""
+    property string filename: ""
+    property string hash: ""
+    property double progress: url && downloader.total > 0 ? downloader.loaded * 100 / downloader.total : 0
+    property string url: ""
+    property bool valid: false
+    property string version: ""
+
+    background: Rectangle {
+        border.color: MoneroComponents.Style.appWindowBorderColor
+        border.width: 1
+        color: MoneroComponents.Style.middlePanelBackgroundColor
+    }
+    closePolicy: Popup.NoAutoClose
+    padding: 20
+    visible: active && allowed
+
+    function show(version, url, hash) {
+        updateDialog.error = "";
+        updateDialog.hash = hash;
+        updateDialog.url = url;
+        updateDialog.valid = false;
+        updateDialog.version = version;
+        updateDialog.active = true;
+    }
+
+    ColumnLayout {
+        id: mainLayout
+        spacing: updateDialog.padding
+
+        Text {
+            color: MoneroComponents.Style.defaultFontColor
+            font.bold: true
+            font.family: MoneroComponents.Style.fontRegular.name
+            font.pixelSize: 18
+            text: qsTr("New Monero version v%1 is available.").arg(updateDialog.version)
+        }
+
+        Text {
+            id: errorText
+            color: "red"
+            font.family: MoneroComponents.Style.fontRegular.name
+            font.pixelSize: 18
+            text: updateDialog.error
+            visible: text
+        }
+
+        Text {
+            id: statusText
+            color: updateDialog.valid ? MoneroComponents.Style.green : MoneroComponents.Style.defaultFontColor
+            font.family: MoneroComponents.Style.fontRegular.name
+            font.pixelSize: 18
+            visible: !errorText.visible
+
+            text: {
+                if (!updateDialog.url) {
+                    return qsTr("Please visit getmonero.org for details") + translationManager.emptyString;
+                }
+                if (downloader.active) {
+                    return "%1 (%2%)"
+                        .arg(qsTr("Downloading"))
+                        .arg(updateDialog.progress.toFixed(1))
+                        + translationManager.emptyString;
+                }
+                if (updateDialog.valid) {
+                    return qsTr("Update downloaded, signature verified") + translationManager.emptyString;
+                }
+                return qsTr("Do you want to download and verify new version?") + translationManager.emptyString;
+            }
+        }
+
+        Rectangle {
+            id: progressBar
+            color: MoneroComponents.Style.lightGreyFontColor
+            height: 3
+            Layout.fillWidth: true
+            visible: updateDialog.valid || downloader.active
+
+            Rectangle {
+                color: MoneroComponents.Style.buttonBackgroundColor
+                height: parent.height
+                width: parent.width * updateDialog.progress / 100
+            }
+        }
+
+        RowLayout {
+            Layout.alignment: Qt.AlignRight
+            spacing: parent.spacing
+
+            MoneroComponents.StandardButton {
+                id: cancelButton
+                fontBold: false
+                primary: !updateDialog.url
+                text: {
+                    if (!updateDialog.url) {
+                        return qsTr("Ok") + translationManager.emptyString;
+                    }
+                    if (updateDialog.valid || downloader.active || errorText.visible) {
+                        return qsTr("Cancel")  + translationManager.emptyString;
+                    }
+                    return qsTr("Download later") + translationManager.emptyString;
+                }
+
+                onClicked: {
+                    downloader.cancel();
+                    updateDialog.active = false;
+                }
+            }
+
+            MoneroComponents.StandardButton {
+                id: downloadButton
+                KeyNavigation.tab: cancelButton
+                fontBold: false
+                text: (updateDialog.error ? qsTr("Retry") : qsTr("Download")) + translationManager.emptyString
+                visible: updateDialog.url && !updateDialog.valid && !downloader.active
+
+                onClicked: {
+                    updateDialog.error = "";
+                    updateDialog.filename = updateDialog.url.replace(/^.*\//, '');
+                    const downloadingStarted = downloader.get(updateDialog.url, updateDialog.hash, function(error) {
+                        if (error) {
+                            console.error("Download failed", error);
+                            updateDialog.error = qsTr("Download failed") + translationManager.emptyString;
+                        } else {
+                            updateDialog.valid = true;
+                        }
+                    });
+                    if (!downloadingStarted) {
+                        updateDialog.error = qsTr("Failed to start download") + translationManager.emptyString;
+                    }
+                }
+            }
+
+            MoneroComponents.StandardButton {
+                id: saveButton
+                KeyNavigation.tab: cancelButton
+                fontBold: false
+                onClicked: {
+                    const fullPath = oshelper.openSaveFileDialog(
+                        qsTr("Save as") + translationManager.emptyString,
+                        oshelper.downloadLocation(),
+                        updateDialog.filename);
+                    if (!fullPath) {
+                        return;
+                    }
+                    if (downloader.saveToFile(fullPath)) {
+                        cancelButton.clicked();
+                        oshelper.openContainingFolder(fullPath);
+                    } else {
+                        updateDialog.error = qsTr("Save operation failed") + translationManager.emptyString;
+                    }
+                }
+                text: qsTr("Save to file") + translationManager.emptyString
+                visible: updateDialog.valid
+            }
+        }
+    }
+
+    Downloader {
+        id: downloader
+        proxyAddress: persistentSettings.getProxyAddress()
+    }
+}

components/WarningBox.qml

@@ -0,0 +1,62 @@
+import QtQuick 2.9
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.0
+
+import "." as MoneroComponents
+
+Rectangle {
+    id: root
+    property alias text: content.text
+    property alias textColor: content.color
+    property int fontSize: 15
+
+    Layout.fillWidth: true
+    Layout.preferredHeight: warningLayout.height
+
+    color: MoneroComponents.Style.titleBarButtonHoverColor
+    radius: 4
+    border.color: MoneroComponents.Style.inputBorderColorInActive
+    border.width: 1
+
+    signal linkActivated;
+
+    RowLayout {
+        id: warningLayout
+        spacing: 0
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        Image {
+            Layout.alignment: Qt.AlignVCenter
+            Layout.preferredHeight: 33
+            Layout.preferredWidth: 33
+            Layout.rightMargin: 12
+            Layout.leftMargin: 18
+            Layout.topMargin: 12
+            Layout.bottomMargin: 12
+            source: "qrc:///images/warning.png"
+        }
+
+        Text {
+            id: content
+            Layout.fillWidth: true
+            color: MoneroComponents.Style.defaultFontColor
+            font.family: MoneroComponents.Style.fontRegular.name
+            font.pixelSize: root.fontSize
+            horizontalAlignment: TextInput.AlignLeft
+            textFormat: Text.RichText
+            wrapMode: Text.WordWrap
+            leftPadding: 4
+            rightPadding: 18
+            topPadding: 10
+            bottomPadding: 10
+            onLinkActivated: root.linkActivated();
+
+            MouseArea {
+                anchors.fill: parent
+                acceptedButtons: Qt.NoButton
+                cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+            }
+        }
+    }
+}

components/effects/ColorTransition.qml

@@ -0,0 +1,58 @@
+// 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.
+
+import QtQuick 2.9
+import QtGraphicalEffects 1.0
+
+import "../" as MoneroComponents
+
+Item {
+    id: root
+    property var targetObj
+    property string blackColor: ""
+    property string whiteColor: ""
+    property int duration: 300
+    property bool themeTransition: true
+
+    states: [
+        State {
+            name: "black";
+            when: MoneroComponents.Style.blackTheme && root.themeTransition
+            PropertyChanges { target: root.targetObj; color: root.blackColor}
+        }, State {
+            name: "white";
+            when: !MoneroComponents.Style.blackTheme && root.themeTransition
+            PropertyChanges { target: root.targetObj; color: root.whiteColor}
+        }
+    ]
+
+    transitions: Transition {
+        enabled: appWindow.themeTransition
+        ColorAnimation { properties: "color"; easing.type: Easing.InOutQuad; duration: root.duration }
+    }
+}

components/effects/GradientBackground.qml

@@ -0,0 +1,107 @@
+// 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.
+
+import QtQuick 2.9
+import QtGraphicalEffects 1.0
+
+import "../" as MoneroComponents
+
+Item {
+    id: root
+    property string fallBackColor: ""
+    property string blackColorStart: ""
+    property string blackColorStop: ""
+    property string whiteColorStart: ""
+    property string whiteColorStop: ""
+    property string initialStartColor: ""
+    property string initialStopColor: ""
+    property double posStart: 0.1
+    property double posStop: 1.0
+    property int duration: 300
+    property variant start
+    property variant end
+    anchors.fill: parent
+
+    // background software renderer
+    Rectangle {
+        visible: !isOpenGL
+        anchors.fill: parent
+        color: root.fallBackColor
+    }
+
+    // background opengl
+    LinearGradient {
+        visible: isOpenGL
+        anchors.fill: parent
+        start: root.start
+        end: root.end
+        gradient: Gradient {
+            GradientStop {
+                id: gradientStart
+                position: root.posStart
+                color: root.initialStartColor
+            }
+            GradientStop {
+                id: gradientStop
+                position: root.posStop
+                color: root.initialStopColor
+            }
+        }
+
+        states: [
+            State {
+                name: "black";
+                when: isOpenGL && MoneroComponents.Style.blackTheme
+                PropertyChanges {
+                    target: gradientStart
+                    color: root.blackColorStart
+                }
+                PropertyChanges {
+                    target: gradientStop
+                    color: root.blackColorStop
+                }
+            }, State {
+                name: "white";
+                when: isOpenGL && !MoneroComponents.Style.blackTheme
+                PropertyChanges {
+                    target: gradientStart
+                    color: root.whiteColorStart
+                }
+                PropertyChanges {
+                    target: gradientStop
+                    color: root.whiteColorStop
+                }
+            }
+        ]
+
+        transitions: Transition {
+            enabled: appWindow.themeTransition
+            ColorAnimation { properties: "color"; easing.type: Easing.InOutQuad; duration: root.duration }
+        }
+    }
+}

components/effects/ImageMask.qml

@@ -0,0 +1,86 @@
+// 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.
+
+import QtQuick 2.9
+import QtGraphicalEffects 1.0
+
+import "../" as MoneroComponents
+import FontAwesome 1.0
+
+Item {
+    // Use this component to color+opacity change images with transparency (svg/png)
+    // Does not work in low graphics mode, use fontAwesome fallback option.
+
+    id: root
+    property string image: ""
+    property string color: ""
+    property var fontAwesomeFallbackIcon: ""
+    property string fontAwesomeFallbackFont: FontAwesome.fontFamilySolid
+    property string fontAwesomeFallbackStyle: "Solid"
+    property int fontAwesomeFallbackSize: 16
+    property double fontAwesomeFallbackOpacity: 0.8
+    property string fontAwesomeFallbackColor: MoneroComponents.Style.defaultFontColor
+
+    property alias fontAwesomeFallback: fontAwesomeFallback
+    property alias svgMask: svgMask
+    property alias imgMockColor: imgMockColor
+
+    width: 0
+    height: 0
+
+    Image {
+        id: svgMask
+        source: root.image
+        sourceSize.width: root.width
+        sourceSize.height: root.height
+        smooth: true
+        mipmap: true
+        visible: false
+    }
+
+    ColorOverlay {
+        id: imgMockColor
+        anchors.fill: root
+        source: svgMask
+        color: root.color
+        visible: image && isOpenGL
+    }
+
+    Text {
+        id: fontAwesomeFallback
+        visible: !imgMockColor.visible
+        text: root.fontAwesomeFallbackIcon
+        font.family: root.fontAwesomeFallbackFont
+        font.pixelSize: root.fontAwesomeFallbackSize
+        font.styleName: root.fontAwesomeFallbackStyle
+        color: root.fontAwesomeFallbackColor
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.horizontalCenter: parent.horizontalCenter
+        opacity: root.fontAwesomeFallbackOpacity
+    }
+}

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)

fonts/CMakeLists.txt

@@ -0,0 +1 @@
+qt5_add_resources(RESOURCE_FILES *.otf)

fonts/FontAwesome/FontAwesome.qml

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