Merge pull request #1721

e26ba82 Windows Installer: Update for Beryllium Bullet 0.13.0.4, take two (rbrunner7)

.github/workflows/build.yml

@@ -1,52 +0,0 @@
-name: continuous-integration/gh-actions/gui
-
-on: [push, pull_request]
-
-jobs:
-  build-macos:
-
-    runs-on: macOS-latest
-    
-    steps:
-    - uses: actions/checkout@v1
-    - name: update brew and install dependencies
-      run: brew update && brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf qt5 
-    - name: build
-      run: export PATH=$PATH:/usr/local/opt/qt/bin && ./build.sh
-    - 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
-    - name: remove bundled boost
-      run: sudo rm -rf /usr/local/share/boost
-    - 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
-    - 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 xvfb
-    - name: build
-      run: ./build.sh
-    - name: test qml
-      run: xvfb-run -a build/release/bin/monero-wallet-gui --test-qml
-
-  build-windows:
-
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - uses: numworks/setup-msys2@v1
-    - name: update pacman
-      run: msys2do pacman -Syu --noconfirm
-    - name: install monero dependencies
-      run: msys2do pacman -S --noconfirm 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
-    - name: build
-      run: msys2do ./build.sh release
-    - name: test qml
-      run: msys2do build/release/bin/monero-wallet-gui --test-qml

.gitignore

@@ -11,25 +11,3 @@ moc_*
 *.xcodeproj
 monero-wallet-gui_plugin_import.cpp
 monero-wallet-gui_qml_plugin_import.cpp
-*.qmlc
-*.jsc
-
-### 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

@@ -1,424 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-project(monero-gui)
-
-message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
-
-set(VERSION_MAJOR "14")
-set(VERSION_MINOR "0")
-set(VERSION_REVISION "3")
-set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
-
-# libwallet requires a static build, so we only allow static compilation
-set(STATIC ON)
-
-option(USE_DEVICE_TREZOR ON)
-option(ENABLE_PASS_STRENGTH_METER "Disable zxcvbn" 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")
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-if(DEBUG)
-	set(CMAKE_VERBOSE_MAKEFILE ON)
-endif()
-
-set(BUILD_GUI_DEPS ON)
-set(ARCH "x86-64")
-set(BUILD_64 ON)
-set(INSTALL_VENDORED_LIBUNBOUND=ON)
-
-function (add_c_flag_if_supported flag var)
-  string(REPLACE "-" "_" supported ${flag}_c)
-  check_c_compiler_flag(${flag} ${supported})
-  if(${${supported}})
-    set(${var} "${${var}} ${flag}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-function (add_cxx_flag_if_supported flag var)
-  string(REPLACE "-" "_" supported ${flag}_cxx)
-  check_cxx_compiler_flag(${flag} ${supported})
-  if(${${supported}})
-    set(${var} "${${var}} ${flag}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-function (add_linker_flag_if_supported flag var)
-  string(REPLACE "-" "_" supported ${flag}_ld)
-  string(REPLACE "," "_" supported ${flag}_ld)
-  check_linker_flag(${flag} ${supported})
-  if(${${supported}})
-    set(${var} "${${var}} ${flag}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-find_package(Git)
-if(GIT_FOUND)
-  if(NOT DEV_MODE)
-    find_package(Git)
-    function (check_submodule relative_path)
-      execute_process(COMMAND git rev-parse "HEAD" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${relative_path} OUTPUT_VARIABLE localHead)
-      execute_process(COMMAND git rev-parse "HEAD:${relative_path}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE checkedHead)
-      string(COMPARE EQUAL "${localHead}" "${checkedHead}" upToDate)
-      if (upToDate)
-        message(STATUS "Submodule '${relative_path}' is up-to-date")
-      else()
-        message(FATAL_ERROR "Submodule '${relative_path}' is not using the checked head. Please update all submodules with\ngit submodule update --init --force\nor run cmake with -DMANUAL_SUBMODULES=1,\n or if you want to build from latest master run cmake with -DEV_MODE,\n or run make devmode")
-      endif()
-    endfunction ()
-    message(STATUS "Checking submodules")
-    check_submodule(monero)
-  else()
-    execute_process(COMMAND cd monero && git checkout origin/master)
-  endif()
-endif()
-
-add_subdirectory(monero)
-set_property(TARGET wallet_merged PROPERTY FOLDER "monero")
-get_directory_property(ARCH_WIDTH DIRECTORY "monero" DEFINITION ARCH_WIDTH)
-
-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 "Buildin with pass strength meter support.")
-else()
-    add_definitions(-DDISABLE_PASS_STRENGTH_METER)
-endif()
-
-include(CheckTrezor)  # Trezor support check
-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
-find_package(OpenSSL REQUIRED)
-message(STATUS "OpenSSL: Version ${OPENSSL_VERSION}")
-message(STATUS "OpenSSL: include dir at ${OPENSSL_INCLUDE_DIR}")
-message(STATUS "OpenSSL: libraries at ${OPENSSL_LIBRARIES} ${OPENSSL_SSL_LIBRARIES}")
-
-# Zbar (for QR scanner)
-if(WITH_SCANNER)
-    add_definitions(-DWITH_SCANNER)
-    find_package(ZBar0)
-    message(STATUS "libzbar: include dir at ${ZBAR_INCLUDE_DIR}")
-    message(STATUS "libzbar: libraries at ${ZBAR_LIBRARIES}")
-endif()
-
-# Sodium
-find_library(SODIUM_LIBRARY sodium)
-message(STATUS "libsodium: libraries at ${SODIUM_LIBRARY}")
-
-# LibUSB
-find_package(LibUSB)
-message(STATUS "libusb: include dir at ${LibUSB_INCLUDE_DIRS}")
-message(STATUS "libusb: libraries at ${LibUSB_LIBRARIES}")
-
-# HIDApi
-find_package(HIDAPI REQUIRED)
-message(STATUS "libhidapi: include dir at ${HIDAPI_INCLUDE_DIRS}")
-message(STATUS "libhidapi: libraries at ${HIDAPI_LIBRARIES}")
-
-# Boost
-if(DEBUG)
-    set(Boost_DEBUG ON)
-endif()
-find_package(Boost 1.62 REQUIRED COMPONENTS
-		system
-		filesystem
-		thread
-		date_time
-		chrono
-		regex
-		serialization
-		program_options
-		locale)
-
-if(UNIX AND NOT APPLE)
-    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")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/Qt/labs/folderlistmodel")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/Qt/labs/settings")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtGraphicalEffects")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtGraphicalEffects/private")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtMultimedia")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtQuick.2")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtQuick/Controls")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtQuick/Controls.2")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtQuick/Dialogs")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtQuick/Dialogs/Private")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtQuick/Layouts")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtQuick/PrivateWidgets")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtQuick/Templates.2")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtQuick/Window.2")
-    link_directories("${msys2_install_path}/mingw${ARCH_WIDTH}/qml/QtQuick/XmlListModel")
-    # 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
-  Qt5QuickControls2
-  Qt5Widgets
-  Qt5Gui
-  Qt5Network
-  Qt5Qml
-  Qt5Multimedia
-  Qt5Xml
-  Qt5XmlPatterns
-  Qt5Svg
-)
-
-foreach(QT5_MODULE ${QT5_LIBRARIES})
-  find_package(${QT5_MODULE} REQUIRED)
-endforeach()
-
-find_package(PkgConfig)
-if(PKGCONFIG_FOUND)
-  pkg_check_modules(QT5_PKG_CONFIG ${QT5_LIBRARIES})
-
-  if(QT5_PKG_CONFIG_FOUND)
-    set(QT5_PKG_CONFIG "QT5_PKG_CONFIG")
-    if(STATIC)
-      set(QT5_PKG_CONFIG "${QT5_PKG_CONFIG}_STATIC")
-    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()
-endif()
-
-list(APPEND QT5_LIBRARIES
-  ${Qt5Gui_PLUGINS}
-  ${Qt5Svg_PLUGINS}
-  ${Qt5Qml_PLUGINS}
-  ${Qt5Network_PLUGINS}
-)
-
-if(STATIC)
-  set(QT5_LIBRARIES
-    qtquickcontrols2plugin # has to be the first one, depends on Qt5QuickControls2
-    ${QT5_LIBRARIES}
-    declarative_multimedia
-    dialogplugin
-    dialogsprivateplugin
-    qmlfolderlistmodelplugin
-    qmlsettingsplugin
-    qmlxmllistmodelplugin
-    qquicklayoutsplugin
-    Qt5EventDispatcherSupport
-    Qt5FontDatabaseSupport
-    Qt5MultimediaQuick_p
-    Qt5PacketProtocol
-    Qt5ThemeSupport
-    qtgraphicaleffectsplugin
-    qtgraphicaleffectsprivate
-    qtquick2plugin
-    qtquickcontrolsplugin
-    qtquicktemplates2plugin
-    widgetsplugin
-    windowplugin
-  )
-
-  if(MINGW)
-    list(APPEND QT5_LIBRARIES qtfreetype)
-
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-      list(APPEND QT5_LIBRARIES D3D11 Dwrite D2d1)
-    endif()
-  endif()
-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 OR 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 (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()
-
-if(STATIC)
-  if(MINGW)
-    add_linker_flag_if_supported(-static STATIC_FLAGS)
-  else()
-    add_linker_flag_if_supported(-static-libgcc STATIC_FLAGS)
-    add_linker_flag_if_supported(-static-libstdc++ STATIC_FLAGS)
-  endif()
-endif()
-
-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} ${C_SECURITY_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${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)
-    list(APPEND EXTRA_LIBRARIES setupapi Version)
-  endif()
-endif()
-
-add_subdirectory(src)
-
-# Required to make wallet_merged build before the gui
-add_dependencies(monero-gui wallet_merged)
-

LeftPanel.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -26,35 +26,28 @@
 // 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 2.2
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
 import moneroComponents.Wallet 1.0
 import moneroComponents.NetworkType 1.0
-import moneroComponents.Clipboard 1.0
-import FontAwesome 1.0
-
-import "components" as MoneroComponents
-import "components/effects/" as MoneroEffects
+import "components"
 
 Rectangle {
     id: panel
 
-    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 unlockedBalanceText: unlockedBalanceText.text
+    property alias unlockedBalanceVisible: unlockedBalanceText.visible
+    property alias unlockedBalanceLabelVisible: unlockedBalanceLabel.visible
+    property alias balanceLabelText: balanceLabel.text
+    property alias balanceText: balanceText.text
     property alias networkStatus : networkStatus
     property alias progressBar : progressBar
     property alias daemonProgressBar : daemonProgressBar
-
+    property alias minutesToUnlockTxt: unlockedBalanceLabel.text
     property int titleBarHeight: 50
-    property string copyValue: ""
-    Clipboard { id: clipboard }
 
+    signal dashboardClicked()
     signal historyClicked()
     signal transferClicked()
     signal receiveClicked()
@@ -64,15 +57,14 @@ Rectangle {
     signal addressBookClicked()
     signal miningClicked()
     signal signClicked()
-    signal merchantClicked()
-    signal accountClicked()
+    signal keysClicked()
 
     function selectItem(pos) {
         menuColumn.previousButton.checked = false
-        if(pos === "History") menuColumn.previousButton = historyButton
+        if(pos === "Dashboard") menuColumn.previousButton = dashboardButton
+        else if(pos === "History") menuColumn.previousButton = historyButton
         else if(pos === "Transfer") menuColumn.previousButton = transferButton
         else if(pos === "Receive")  menuColumn.previousButton = receiveButton
-        else if(pos === "Merchant")  menuColumn.previousButton = merchantButton
         else if(pos === "AddressBook") menuColumn.previousButton = addressBookButton
         else if(pos === "Mining") menuColumn.previousButton = miningButton
         else if(pos === "TxKey")  menuColumn.previousButton = txkeyButton
@@ -80,27 +72,23 @@ 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
+        else if(pos === "Keys") menuColumn.previousButton = keysButton
+
         menuColumn.previousButton.checked = true
     }
 
-    width: 300
+    width: (isMobile)? appWindow.width : 300
     color: "transparent"
     anchors.bottom: parent.bottom
     anchors.top: parent.top
 
-    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)
+    Image {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        height: panel.height
+        source: "images/leftPanelBg.jpg"
+        z: 1
     }
 
     // card with monero logo
@@ -108,43 +96,30 @@ Rectangle {
         visible: true
         z: 2
         id: column1
-        height: 175
+        height: 210
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.top: parent.top
         anchors.topMargin: (persistentSettings.customDecorations)? 50 : 0
 
-        Item {
+        RowLayout {
+            visible: true
             Item {
                 anchors.left: parent.left
                 anchors.top: parent.top
                 anchors.topMargin: 20
                 anchors.leftMargin: 20
-                height: 490
-                width: 260
+                anchors.verticalCenter: parent.verticalCenter
+                height: 490 * scaleRatio
+                width: 260 * scaleRatio
 
                 Image {
-                    id: card
-                    visible: !isOpenGL || MoneroComponents.Style.blackTheme
-                    width: 260
-                    height: 135
+                    width: 260; height: 170
                     fillMode: Image.PreserveAspectFit
-                    source: MoneroComponents.Style.blackTheme ? "qrc:///images/card-background-black.png" : "qrc:///images/card-background-white.png"
+                    source: "images/card-background.png"
                 }
 
-                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 {
+                Text {
                     id: testnetLabel
                     visible: persistentSettings.nettype != NetworkType.MAINNET
                     text: (persistentSettings.nettype == NetworkType.TESTNET ? qsTr("Testnet") : qsTr("Stagenet")) + translationManager.emptyString
@@ -155,10 +130,9 @@ Rectangle {
                     font.bold: true
                     font.pixelSize: 12
                     color: "#f33434"
-                    themeTransition: false
                 }
 
-                MoneroComponents.TextPlain {
+                Text {
                     id: viewOnlyLabel
                     visible: viewOnly
                     text: qsTr("View Only") + translationManager.emptyString
@@ -169,7 +143,6 @@ Rectangle {
                     font.pixelSize: 12
                     font.bold: true
                     color: "#ff9323"
-                    themeTransition: false
                 }
             }
 
@@ -178,159 +151,91 @@ Rectangle {
                 anchors.top: parent.top
                 anchors.topMargin: 20
                 anchors.leftMargin: 20
-                height: 490
-                width: 50
+                anchors.verticalCenter: parent.verticalCenter
+                height: 490 * scaleRatio
+                width: 50 * scaleRatio
 
-                MoneroComponents.Label {
-                    fontSize: 12
-                    id: accountIndex
-                    text: qsTr("Account") + translationManager.emptyString + " #" + currentAccountIndex
-                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
-                    anchors.left: parent.left
-                    anchors.leftMargin: 60
-                    anchors.top: parent.top
-                    anchors.topMargin: 23
-                    themeTransition: false
-
-                    MouseArea{
-                        anchors.fill: parent
-                        hoverEnabled: true
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: appWindow.showPageRequest("Account")
-                    }
-                }
-
-                MoneroComponents.Label {
-                    fontSize: 16
-                    id: accountLabel
-                    textWidth: 170
-                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
-                    anchors.left: parent.left
-                    anchors.leftMargin: 60
-                    anchors.top: parent.top
-                    anchors.topMargin: 36
-                    themeTransition: false
-                    elide: Text.ElideRight
-
-                    MouseArea {
-                        hoverEnabled: true
-                        anchors.fill: parent
-                        cursorShape: Qt.PointingHandCursor
-                        onClicked: appWindow.showPageRequest("Account")
-                    }
-                }
-
-                MoneroComponents.Label {
-                    fontSize: 16
-                    visible: isSyncing
-                    text: qsTr("Syncing...")
-                    color: MoneroComponents.Style.blackTheme ? "white" : "black"
-                    anchors.left: parent.left
-                    anchors.leftMargin: 20
-                    anchors.bottom: currencyLabel.top
-                    anchors.bottomMargin: 15
-                    themeTransition: false
-                }
-
-                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"
+                Text {
+                    visible: !isMobile
+                    id: balanceText
                     anchors.left: parent.left
                     anchors.leftMargin: 20
                     anchors.top: parent.top
-                    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"
-                    text: {
-                        if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) {
-                            return balanceFiatString.split('.')[0] + "."
-                        } else {
-                            return balanceString.split('.')[0] + "."
-                        }
-                    }
+                    anchors.topMargin: 76
+                    font.family: "Arial"
+                    color: "#FFFFFF"
+                    text: "N/A"
+                    // dynamically adjust text size
                     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
+                        var digits = text.split('.')[0].length
+                        var defaultSize = 22;
+                        if(digits > 2) {
+                            return defaultSize - 1.1*digits
                         }
-                    }
-                    MouseArea {
-                        id: balancePart1MouseArea
-                        hoverEnabled: true
-                        anchors.fill: parent
-                        cursorShape: Qt.PointingHandCursor
-                        onEntered: {
-                            balancePart1.color = MoneroComponents.Style.orange
-                            balancePart2.color = MoneroComponents.Style.orange
-                        }
-                        onExited: {
-                            balancePart1.color = Qt.binding(function() { return MoneroComponents.Style.blackTheme ? "white" : "black" })
-                            balancePart2.color = Qt.binding(function() { return MoneroComponents.Style.blackTheme ? "white" : "black" })
-                        }
-                        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: MoneroComponents.Style.blackTheme ? "white" : "black"
-                    text: {
-                        if (persistentSettings.fiatPriceEnabled && persistentSettings.fiatPriceToggle) {
-                            return balanceFiatString.split('.')[1]
-                        } else {
-                            return balanceString.split('.')[1]
-                        }
-                    }
-                    font.pixelSize: 16
-                    MouseArea {
-                        hoverEnabled: true
-                        anchors.fill: parent
-                        cursorShape: Qt.PointingHandCursor
-                        onEntered: balancePart1MouseArea.entered()
-                        onExited: balancePart1MouseArea.exited()
-                        onClicked: balancePart1MouseArea.clicked(mouse)
+                        return defaultSize;
                     }
                 }
 
+                Text {
+                    id: unlockedBalanceText
+                    visible: true
+                    anchors.left: parent.left
+                    anchors.leftMargin: 20
+                    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;
+                    }
+                }
+
+                Label {
+                    id: unlockedBalanceLabel
+                    visible: true
+                    text: qsTr("Unlocked balance") + translationManager.emptyString
+                    anchors.left: parent.left
+                    anchors.leftMargin: 20
+                    anchors.top: parent.top
+                    anchors.topMargin: 110
+                }
+
+                Label {
+                    visible: !isMobile
+                    id: balanceLabel
+                    text: qsTr("Balance") + translationManager.emptyString
+                    fontSize: 14
+                    anchors.left: parent.left
+                    anchors.leftMargin: 20
+                    anchors.top: parent.top
+                    anchors.topMargin: 60
+                }
                 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
+                }
+              */
             }
         }
     }
@@ -341,19 +246,20 @@ Rectangle {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.bottom: parent.bottom
-        anchors.top: column1.bottom
+        anchors.top: (isMobile)? parent.top : column1.bottom
         color: "transparent"
 
+
         Flickable {
             id:flicker
             contentHeight: menuColumn.height
             anchors.top: parent.top
-            anchors.bottom: progressBar.visible ? progressBar.top : networkStatus.top
+            anchors.bottom: networkStatus.top
             width: parent.width
-            boundsBehavior: isMac ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
             clip: true
 
         Column {
+
             id: menuColumn
             anchors.left: parent.left
             anchors.right: parent.right
@@ -361,41 +267,51 @@ Rectangle {
             clip: true
             property var previousButton: transferButton
 
-            // top border
-            MoneroComponents.MenuButtonDivider {
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.leftMargin: 20
-            }
+            // ------------- Dashboard tab ---------------
 
-            // ------------- Account tab ---------------
-            MoneroComponents.MenuButton {
-                id: accountButton
+            /*
+            MenuButton {
+                id: dashboardButton
                 anchors.left: parent.left
                 anchors.right: parent.right
-                text: qsTr("Account") + translationManager.emptyString
-                symbol: qsTr("T") + translationManager.emptyString
+                text: qsTr("Dashboard") + translationManager.emptyString
+                symbol: qsTr("D") + translationManager.emptyString
+                dotColor: "#FFE00A"
+                checked: true
                 onClicked: {
                     parent.previousButton.checked = false
-                    parent.previousButton = accountButton
-                    panel.accountClicked()
+                    parent.previousButton = dashboardButton
+                    panel.dashboardClicked()
                 }
             }
 
-            MoneroComponents.MenuButtonDivider {
-                visible: accountButton.present
+
+            Rectangle {
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 20
+                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
             }
 
             // ------------- Transfer tab ---------------
-            MoneroComponents.MenuButton {
+            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
@@ -403,21 +319,24 @@ Rectangle {
                 }
             }
 
-            MoneroComponents.MenuButtonDivider {
+            Rectangle {
                 visible: transferButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
+                color: "#313131"
+                height: 1
             }
 
             // ------------- AddressBook tab ---------------
 
-            MoneroComponents.MenuButton {
+            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
@@ -426,109 +345,93 @@ Rectangle {
                 }
             }
 
-            MoneroComponents.MenuButtonDivider {
+            Rectangle {
                 visible: addressBookButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
+                color: "#313131"
+                height: 1
             }
 
             // ------------- Receive tab ---------------
-            MoneroComponents.MenuButton {
+            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()
                 }
             }
-
-            MoneroComponents.MenuButtonDivider {
+            Rectangle {
                 visible: receiveButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 20
-            }
-
-            // ------------- Merchant tab ---------------
-
-            MoneroComponents.MenuButton {
-                id: merchantButton
-                visible: appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                text: qsTr("Merchant") + translationManager.emptyString
-                symbol: qsTr("U") + translationManager.emptyString
-                under: receiveButton
-                onClicked: {
-                    parent.previousButton.checked = false
-                    parent.previousButton = merchantButton
-                    panel.merchantClicked()
-                }
-            }
-
-            MoneroComponents.MenuButtonDivider {
-                visible: merchantButton.present && appWindow.walletMode >= 2
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
+                color: "#313131"
+                height: 1
             }
 
             // ------------- History tab ---------------
 
-            MoneroComponents.MenuButton {
+            MenuButton {
                 id: historyButton
                 anchors.left: parent.left
                 anchors.right: parent.right
-                text: qsTr("Transactions") + translationManager.emptyString
+                text: qsTr("History") + translationManager.emptyString
                 symbol: qsTr("H") + translationManager.emptyString
+                dotColor: "#6B0072"
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = historyButton
                     panel.historyClicked()
                 }
             }
-
-            MoneroComponents.MenuButtonDivider {
+            Rectangle {
                 visible: historyButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
+                color: "#313131"
+                height: 1
             }
 
             // ------------- Advanced tab ---------------
-            MoneroComponents.MenuButton {
+            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
                 }
             }
-
-            MoneroComponents.MenuButtonDivider {
-                visible: advancedButton.present && appWindow.walletMode >= 2
+            Rectangle {
+                visible: advancedButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
+                color: "#313131"
+                height: 1
             }
 
             // ------------- Mining tab ---------------
-            MoneroComponents.MenuButton {
+            MenuButton {
                 id: miningButton
-                visible: !isAndroid && !isIOS && appWindow.walletMode >= 2
+                visible: !isAndroid && !isIOS
                 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
@@ -537,21 +440,22 @@ Rectangle {
                 }
             }
 
-            MoneroComponents.MenuButtonDivider {
-                visible: miningButton.present && appWindow.walletMode >= 2
+            Rectangle {
+                visible: miningButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
+                color: miningButton.checked || settingsButton.checked ? "#1C1C1C" : "#313131"
+                height: 1
             }
-
             // ------------- TxKey tab ---------------
-            MoneroComponents.MenuButton {
+            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
@@ -559,22 +463,22 @@ Rectangle {
                     panel.txkeyClicked()
                 }
             }
-
-            MoneroComponents.MenuButtonDivider {
-                visible: txkeyButton.present && appWindow.walletMode >= 2
+            Rectangle {
+                visible: txkeyButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
+                color: "#313131"
+                height: 1
             }
-
             // ------------- Shared RingDB tab ---------------
-            MoneroComponents.MenuButton {
+            MenuButton {
                 id: sharedringdbButton
-                visible: appWindow.walletMode >= 2
                 anchors.left: parent.left
                 anchors.right: parent.right
                 text: qsTr("Shared RingDB") + translationManager.emptyString
                 symbol: qsTr("G") + translationManager.emptyString
+                dotColor: "#FFD781"
                 under: advancedButton
                 onClicked: {
                     parent.previousButton.checked = false
@@ -582,22 +486,24 @@ Rectangle {
                     panel.sharedringdbClicked()
                 }
             }
-
-            MoneroComponents.MenuButtonDivider {
-                visible: sharedringdbButton.present && appWindow.walletMode >= 2
+            Rectangle {
+                visible: sharedringdbButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
+                color: "#313131"
+                height: 1
             }
 
+
             // ------------- Sign/verify tab ---------------
-            MoneroComponents.MenuButton {
+            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
@@ -605,33 +511,58 @@ Rectangle {
                     panel.signClicked()
                 }
             }
-
-            MoneroComponents.MenuButtonDivider {
-                visible: signButton.present && appWindow.walletMode >= 2
+            Rectangle {
+                visible: signButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 20
+                anchors.leftMargin: 16
+                color: "#313131"
+                height: 1
             }
-
             // ------------- Settings tab ---------------
-            MoneroComponents.MenuButton {
+            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()
                 }
             }
-
-            MoneroComponents.MenuButtonDivider {
+            Rectangle {
                 visible: settingsButton.present
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 20
+                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
             }
 
         } // Column
@@ -644,41 +575,51 @@ Rectangle {
             anchors.right: parent.right
             anchors.leftMargin: 0
             anchors.rightMargin: 0
-            anchors.bottom: progressBar.visible ? progressBar.top : networkStatus.top
-            height: 10
+            anchors.bottom: networkStatus.top;
+            height: 10 * scaleRatio
             color: "transparent"
         }
 
-        MoneroComponents.ProgressBar {
+        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 {
             id: progressBar
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.bottom: daemonProgressBar.top
-            height: 48
-            syncType: qsTr("Wallet") + translationManager.emptyString
-            visible: !appWindow.disconnected
+            height: 48 * scaleRatio
+            syncType: qsTr("Wallet")
+            visible: networkStatus.connected
         }
 
-        MoneroComponents.ProgressBar {
+        ProgressBar {
             id: daemonProgressBar
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.bottom: networkStatus.top
-            syncType: qsTr("Daemon") + translationManager.emptyString
-            visible: !appWindow.disconnected
-            height: 62
-        }
-        
-        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
+            syncType: qsTr("Daemon")
+            visible: networkStatus.connected
+            height: 62 * scaleRatio
         }
-    }
+    } // menuRect
+
+
+
+    // indicate disabled state
+//    Desaturate {
+//        anchors.fill: parent
+//        source: parent
+//        desaturation: panel.enabled ? 0.0 : 1.0
+//    }
+
+
 }

Logger.cpp

@@ -0,0 +1,49 @@
+#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

@@ -0,0 +1,8 @@
+#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

@@ -0,0 +1,14 @@
+#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

@@ -0,0 +1,18 @@
+#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

@@ -1,40 +0,0 @@
-ANDROID_STANDALONE_TOOLCHAIN_PATH ?= /usr/local/toolchain
-
-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),)
-  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) -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
-debug:
-	mkdir -p build && cd build && cmake -D DEV_MODE=$(or ${DEV_MODE},ON) .. && $(MAKE) VERBOSE=1
-devmode:
-	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},ON) -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
-clean:
-	mkdir -p build && cd build && rm -rf *
-scanner:
-	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},ON) -D WITH_SCANNER=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
-
-debug-static-win64:
-	mkdir -p $(builddir)/debug && cd $(builddir)/debug && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},ON) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Debug -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(cd $MINGW_PREFIX/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
-
-debug-static-mac64:
-	mkdir -p $(builddir)/debug
-	cd $(builddir)/debug && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},ON) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="mac-x64" $(topdir) && $(MAKE)
-
-release-static-win64:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(cd $MINGW_PREFIX/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
-

MiddlePanel.qml

@@ -28,8 +28,9 @@
 
 
 import QtQml 2.0
-import QtQuick 2.9
-import QtQuick.Controls 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.Controls 1.4
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.0
@@ -37,22 +38,24 @@ 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 int minHeight: (appWindow.height > 800) ? appWindow.height : 800
+    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 alias contentHeight: mainFlickable.contentHeight
     property alias flickable: mainFlickable
+//    property int headerHeight: header.height
 
     property Transfer transferView: Transfer { }
     property Receive receiveView: Receive { }
-    property Merchant merchantView: Merchant { }
     property TxKey txkeyView: TxKey { }
     property SharedRingDB sharedringdbView: SharedRingDB { }
     property History historyView: History { }
@@ -61,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()
@@ -69,25 +72,12 @@ Rectangle {
     signal getProofClicked(string txid, string address, string message);
     signal checkProofClicked(string txid, string address, string message, string signature);
 
-    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)
+    Image {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        source: "../images/middlePanelBg.jpg"
     }
 
     onCurrentViewChanged: {
@@ -118,67 +108,72 @@ Rectangle {
 
         states: [
             State {
+                name: "Dashboard"
+                PropertyChanges {  }
+            }, State {
                 name: "History"
                 PropertyChanges { target: root; currentView: historyView }
-                PropertyChanges { target: mainFlickable; contentHeight: historyView.contentHeight + 80}
+                PropertyChanges { target: historyView; model: appWindow.currentWallet ? appWindow.currentWallet.historyModel : null }
+                PropertyChanges { target: mainFlickable; contentHeight: historyView.tableHeight + 220 * scaleRatio }
             }, State {
                 name: "Transfer"
                 PropertyChanges { target: root; currentView: transferView }
-                PropertyChanges { target: mainFlickable; contentHeight: transferView.transferHeight1 + transferView.transferHeight2 + 80 }
+                PropertyChanges { target: mainFlickable; contentHeight: 1000 * scaleRatio }
             }, State {
-                name: "Receive"
-                PropertyChanges { target: root; currentView: receiveView }
-                PropertyChanges { target: mainFlickable; contentHeight: receiveView.receiveHeight + 80 }
+               name: "Receive"
+               PropertyChanges { target: root; currentView: receiveView }
+               PropertyChanges { target: mainFlickable; contentHeight: receiveView.receiveHeight + 100 }
             }, State {
-                name: "Merchant"
-                PropertyChanges { target: root; currentView: merchantView }
-                PropertyChanges { target: mainFlickable; contentHeight: merchantView.merchantHeight + 80 }
+               name: "TxKey"
+               PropertyChanges { target: root; currentView: txkeyView }
+               PropertyChanges { target: mainFlickable; contentHeight: 1200 * scaleRatio  }
             }, State {
-                name: "TxKey"
-                PropertyChanges { target: root; currentView: txkeyView }
-                PropertyChanges { target: mainFlickable; contentHeight: txkeyView.txkeyHeight + 80 }
-            }, State {
-                name: "SharedRingDB"
-                PropertyChanges { target: root; currentView: sharedringdbView }
-                PropertyChanges { target: mainFlickable; contentHeight: sharedringdbView.panelHeight + 80  }
+               name: "SharedRingDB"
+               PropertyChanges { target: root; currentView: sharedringdbView }
+               PropertyChanges { target: mainFlickable; contentHeight: sharedringdbView.panelHeight + 100  }
             }, State {
                 name: "AddressBook"
-                PropertyChanges { target: root; currentView: addressBookView }
-                PropertyChanges { target: mainFlickable; contentHeight: addressBookView.addressbookHeight + 80 }
+                PropertyChanges {  target: root; currentView: addressBookView  }
+                PropertyChanges { target: mainFlickable; contentHeight: minHeight }
             }, State {
                 name: "Sign"
-                PropertyChanges { target: root; currentView: signView }
-                PropertyChanges { target: mainFlickable; contentHeight: signView.signHeight + 80 }
+               PropertyChanges { target: root; currentView: signView }
+               PropertyChanges { target: mainFlickable; contentHeight: 1200 * scaleRatio  }
             }, State {
                 name: "Settings"
-                PropertyChanges { target: root; currentView: settingsView }
-                PropertyChanges { target: mainFlickable; contentHeight: settingsView.settingsHeight }
+               PropertyChanges { target: root; currentView: settingsView }
+               PropertyChanges { target: mainFlickable; contentHeight: settingsView.settingsHeight }
             }, State {
                 name: "Mining"
                 PropertyChanges { target: root; currentView: miningView }
-                PropertyChanges { target: mainFlickable; contentHeight: miningView.miningHeight + 80 }
+                PropertyChanges { target: mainFlickable; contentHeight: minHeight  }
             }, State {
                 name: "Keys"
                 PropertyChanges { target: root; currentView: keysView }
-                PropertyChanges { target: mainFlickable; contentHeight: keysView.keysHeight + 80}
-            }, State {
-                name: "Account"
-                PropertyChanges { target: root; currentView: accountView }
-                PropertyChanges { target: mainFlickable; contentHeight: accountView.accountHeight + 80 }
-            }	
+                PropertyChanges { target: mainFlickable; contentHeight: minHeight  + 200 * scaleRatio }
+            }
         ]
 
+    // 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: {
-            if(currentView === merchantView || currentView === historyView)
-                return 0;
-
-            return 20;
-        }
-
+        anchors.margins: 18
         anchors.topMargin: appWindow.persistentSettings.customDecorations ? 50 : 0
-        anchors.bottomMargin: 0
         spacing: 0
 
         Flickable {
@@ -186,23 +181,15 @@ 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
@@ -237,28 +224,11 @@ Rectangle {
 
     // border
     Rectangle {
-        id: borderLeft
-        visible: middlePanel.state !== "Merchant"
-        anchors.top: parent.top
+        anchors.top: styledRow.bottom
         anchors.bottom: parent.bottom
         anchors.left: parent.left
         width: 1
-        color: MoneroComponents.Style.appWindowBorderColor
-
-        MoneroEffects.ColorTransition {
-            targetObj: parent
-            blackColor: MoneroComponents.Style._b_appWindowBorderColor
-            whiteColor: MoneroComponents.Style._w_appWindowBorderColor
-        }
-    }
-
-    // border shadow
-    Image {
-        source: "qrc:///images/middlePanelShadow.png"
-        width: 12
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        anchors.left: borderLeft.right
+        color: "#313131"
     }
 
     /* connect "payment" click */

README.md

@@ -1,15 +1,14 @@
 # Monero GUI
 
-Copyright (c) 2014-2019, The Monero Project
+Copyright (c) 2014-2018, 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
 
@@ -56,17 +55,11 @@ 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)
-
 ## Installing the Monero GUI from a package
 
 Packages are available for
 
-* Arch Linux: pacman -S monero-gui
+* 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
 
@@ -74,8 +67,6 @@ 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.
-
 ### On Linux:
 
 (Tested on Ubuntu 17.10 x64, Ubuntu 18.04 x64 and Gentoo x64)
@@ -84,27 +75,19 @@ Packaging for your favorite distribution would be a welcome contribution!
 
   - For Debian distributions (Debian, Ubuntu, Mint, Tails...)
 
-	`sudo apt install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev libprotobuf-dev protobuf-compiler`
+	`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`
 
   - For Gentoo
 
 	`sudo emerge app-arch/xz-utils app-doc/doxygen dev-cpp/gtest dev-libs/boost dev-libs/expat dev-libs/openssl dev-util/cmake media-gfx/graphviz net-dns/unbound net-libs/ldns net-libs/miniupnpc net-libs/zeromq sys-libs/libunwind dev-libs/libsodium dev-libs/hidapi`
 
-  - 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`
-
 2. Install Qt:
 
-  *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.
+  *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.
 
   - For Ubuntu 17.10+
 
-    `sudo apt install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel qttools5-dev-tools qml-module-qtquick-templates2 libqt5svg5-dev`
+    `sudo apt install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-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`
 
   - For Gentoo
 
@@ -144,16 +127,31 @@ The executable can be found in the build/release/bin folder.
 
 3. Install [monero](https://github.com/monero-project/monero) dependencies:
 
-  `brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf`
+  `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.
 
 4. Install Qt:
 
-  `brew install qt5`  (or download QT 5.9.7+ from [qt.io](https://www.qt.io/download-open-source/))
+  `brew install qt5`  (or download QT 5.8+ 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. Add the Qt bin directory to your path
 
-  - Example for Qt: `export PATH=$PATH:$HOME/Qt/5.9.7/clang_64/bin`
-  - Example for Homebrew: `export PATH=$PATH:/usr/local/opt/qt/bin`
+    Example: `export PATH=$PATH:$HOME/Qt/5.8/clang_64/bin`
+
+    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
 
@@ -169,6 +167,19 @@ The executable can be found in the build/release/bin folder.
 
 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
+
+
 ### On Windows:
 
 The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not officially supported anymore.
@@ -180,15 +191,9 @@ 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 mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb
+    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
     ```
 
-    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
@@ -215,11 +220,9 @@ The Monero GUI on Windows is 64 bits only; 32-bit Windows GUI builds are not off
 
     ```
     cd monero-gui
-    source ./build.sh release-static
+    ./build.sh
     cd build
     make deploy
     ```
 
-    **Note:** The use of `source` above is a dirty workaround for a suspected bug in the current QT version 5.11.2-3 available in the MSYS2 packaging system, see https://github.com/monero-project/monero-gui/issues/1559 for more info.
-
 The executable can be found in the `.\release\bin` directory.

RightPanel.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -26,9 +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.
 
-#include <assert.h>
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
+import QtGraphicalEffects 1.0
 
-static_assert(1, "FAIL");
-int main(int argc, char *argv[]) {
-	return 0;
+import "tabs"
+import "components"
+
+Rectangle {
+    id: root
+    width: 330
+    color: "#FFFFFF"
 }

TranslationManager.cpp

@@ -1,31 +1,3 @@
-// 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.
-
 #include "TranslationManager.h"
 
 #include <QApplication>

TranslationManager.h

@@ -0,0 +1,29 @@
+#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

build.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 BUILD_TYPE=$1
-BUILD_TREZOR=${BUILD_TREZOR-true}
 source ./utils.sh
 platform=$(get_platform)
 # default build type
@@ -73,7 +72,6 @@ if [[ $platform == *bsd* ]]; then
 fi
 
 # build libwallet
-export BUILD_TREZOR
 ./get_libwallet_api.sh $BUILD_TYPE
  
 # build zxcvbn

clipboardAdapter.cpp

@@ -38,7 +38,3 @@ void clipboardAdapter::setText(const QString &text) {
     m_pClipboard->setText(text, QClipboard::Clipboard);
     m_pClipboard->setText(text, QClipboard::Selection);
 }
-
-QString clipboardAdapter::text() const {
-    return m_pClipboard->text();
-}

clipboardAdapter.h

@@ -1,21 +1,21 @@
-// Copyright (c) 2014-2019, The Monero Project
-//
+// 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
@@ -39,7 +39,6 @@ class clipboardAdapter : public QObject
 public:
     explicit clipboardAdapter(QObject *parent = 0);
     Q_INVOKABLE void setText(const QString &text);
-    Q_INVOKABLE QString text() const;
 
 private:
     QClipboard *m_pClipboard;

cmake/32-bit-toolchain.cmake

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

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

@@ -1,14 +0,0 @@
-#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

@@ -1,47 +0,0 @@
-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/CheckTrezor.cmake

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

cmake/Doxygen.extra.css.in

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

cmake/FindBacktrace.cmake

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

cmake/FindBerkeleyDB.cmake

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

cmake/FindHIDAPI.cmake

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

cmake/FindLibUSB.cmake

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

cmake/FindLibunwind.cmake

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

cmake/FindMiniupnpc.cmake

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

cmake/FindReadline.cmake

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

cmake/FindUnbound.cmake

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

cmake/FindZBar0.cmake

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

cmake/GenVersion.cmake

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

cmake/GenVersionGui.cmake

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

cmake/Version.cmake

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

cmake/VersionGui.cmake

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

cmake/test-libusb-version.c

@@ -1,52 +0,0 @@
-// Copyright (c) 2014-2019, The Monero Project
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <libusb.h>
-
-#define UNUSED(expr) (void)(expr)
-
-int main(int argc, char *argv[]) {
-  libusb_device **devs;
-  libusb_context *ctx = NULL;
-
-  int r = libusb_init(&ctx); UNUSED(r);
-  ssize_t cnt = libusb_get_device_list(ctx, &devs); UNUSED(cnt);
-
-  struct libusb_device_descriptor desc;
-  r = libusb_get_device_descriptor(devs[0], &desc); UNUSED(r);
-  uint8_t bus_id = libusb_get_bus_number(devs[0]); UNUSED(bus_id);
-  uint8_t addr = libusb_get_device_address(devs[0]); UNUSED(addr);
-
-  uint8_t tmp_path[16];
-  r = libusb_get_port_numbers(devs[0], tmp_path, sizeof(tmp_path));
-  UNUSED(r);
-  UNUSED(tmp_path);
-
-  libusb_free_device_list(devs, 1);
-  libusb_exit(ctx);
-}

cmake/test-protobuf.cpp

@@ -1,43 +0,0 @@
-// Copyright (c) 2014-2019, The Monero Project
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <string>
-#include <iostream>
-#include <google/protobuf/message.h>
-#include <google/protobuf/unknown_field_set.h>
-#include "test-protobuf.pb.h"
-
-int main(int argc, char *argv[]) {
-  google::protobuf::UnknownFieldSet ufs;
-  ufs.ClearAndFreeMemory();
-
-  Success sc;
-  sc.set_message("test");
-  sc.SerializeToOstream(&std::cerr);
-  return 0;
-}

cmake/test-protobuf.proto

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

cmake/test-static-assert.cpp

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

components/AddressBookTable.qml

@@ -0,0 +1,171 @@
+// 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/CMakeLists.txt

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

components/CheckBox2.qml

@@ -26,24 +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.9
+import QtQuick 2.0
 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 int fontSize: 14
+    property string background: "backgroundRect.color"
+    property int fontSize: 14 * scaleRatio
     property alias fontColor: label.color
-    property int textMargin: 8
+    property int textMargin: 8 * scaleRatio
+    property bool darkDropIndicator: false
     signal clicked()
-    height: 25
+    height: 25 * scaleRatio
 
     function toggle(){
         checkBox.checked = !checkBox.checked
@@ -57,8 +57,9 @@ RowLayout {
             height: label.height
             width: (label.width + indicatorRect.width + checkBox.textMargin)
             color: "transparent"
+            anchors.left: parent.left
 
-            MoneroComponents.TextPlain {
+            Text {
                 id: label
                 font.family: Style.fontLight.name
                 font.pixelSize: checkBox.fontSize
@@ -75,29 +76,23 @@ RowLayout {
                 anchors.left: label.right
                 anchors.leftMargin: textMargin
                 color: "transparent"
-                rotation: checkBox.checked ? 180  : 0
+                rotation: checkBox.checked ? 180  * scaleRatio : 0
 
-                MoneroEffects.ImageMask {
+                Image {
                     id: indicatorImage
                     anchors.centerIn: parent
-                    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
-                    }
+                    source: "../images/whiteDropIndicator.png"
+                    visible: !darkDropIndicator
+                }
+                ColorOverlay {
+                    anchors.fill: indicatorImage
+                    source: indicatorImage
+                    color: "#FF000000"
+                    visible: darkDropIndicator
                 }
             }
 
-            MouseArea {
+            MouseArea{
                 anchors.fill: parent
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
@@ -106,5 +101,7 @@ RowLayout {
                 }
             }
         }
+
+
     }
 }

components/ContextMenu.qml

@@ -1,40 +0,0 @@
-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

@@ -1,52 +0,0 @@
-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

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

components/DashboardTable.qml

@@ -0,0 +1,252 @@
+// 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,22 +26,18 @@
 // 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 2.2
 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 "." as MoneroComponents
-import "effects/" as MoneroEffects
+import "../components" as MoneroComponents
 
 Item {
     id: datePicker
-    readonly property alias expanded: popup.visible
+    property bool expanded: false
     property date currentDate
     property bool showCurrentDate: true
-    property color backgroundColor : MoneroComponents.Style.appWindowBorderColor
+    property color backgroundColor : "#404040"
     property color errorColor : "red"
     property bool error: false
     property alias inputLabel: inputLabel
@@ -52,13 +48,26 @@ 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
 
-        MoneroComponents.TextPlain {
+        Text {
             id: inputLabel
             anchors.top: parent.top
             anchors.topMargin: 2
@@ -68,7 +77,6 @@ Item {
             font.bold: false
             textFormat: Text.RichText
             color: MoneroComponents.Style.defaultFontColor
-            themeTransition: false
 
             MouseArea {
                 anchors.fill: parent
@@ -81,7 +89,7 @@ Item {
     Item {
         id: head
         anchors.top: inputLabelRect.bottom
-        anchors.topMargin: 6
+        anchors.topMargin: 6 * scaleRatio
         anchors.left: parent.left
         anchors.right: parent.right
         height: 28
@@ -98,14 +106,45 @@ Item {
             color: datePicker.backgroundColor
         }
 
-        RowLayout {
+        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 {
             id: dateInput
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
-            anchors.leftMargin: 2
-            anchors.right: parent.right
-            property string headerFontColor: MoneroComponents.Style.blackTheme ? "#e6e6e6" : "#333333"
-            spacing: 0
+            anchors.leftMargin: 10
 
             function setDate(date) {
                 var day = date.getDate()
@@ -125,14 +164,12 @@ Item {
             TextInput {
                 id: dayInput
                 readOnly: true
-                Layout.preferredWidth: childrenRect.width + 40
+                width: 22
                 font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
-                color: datePicker.error ? errorColor : parent.headerFontColor
-                selectionColor: MoneroComponents.Style.dimmedFontColor
-                selectByMouse: true
-                horizontalAlignment: TextInput.AlignHCenter
+                color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 maximumLength: 2
+                horizontalAlignment: TextInput.AlignHCenter
                 validator: IntValidator{bottom: 01; top: 31;}
                 KeyNavigation.tab: monthInput
 
@@ -150,25 +187,22 @@ Item {
                 }
             }
 
-            MoneroComponents.TextPlain {
+            Text {
                 font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
                 color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 text: "-"
-                themeTransition: false
             }
 
             TextInput {
                 id: monthInput
                 readOnly: true
-                Layout.preferredWidth: childrenRect.width + 40
+                width: 22
                 font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
-                color: datePicker.error ? errorColor : parent.headerFontColor
-                selectionColor: MoneroComponents.Style.dimmedFontColor
-                selectByMouse: true
-                horizontalAlignment: TextInput.AlignHCenter
+                color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 maximumLength: 2
+                horizontalAlignment: TextInput.AlignHCenter
                 validator: IntValidator{bottom: 01; top: 12;}
                 KeyNavigation.tab: yearInput
                 text: {
@@ -185,27 +219,23 @@ Item {
                 }
             }
 
-            MoneroComponents.TextPlain {
+            Text {
                 font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
                 color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 text: "-"
-                themeTransition: false
             }
 
             TextInput {
                 id: yearInput
-                Layout.preferredWidth: childrenRect.width + 60
+                width: 44
                 font.family: MoneroComponents.Style.fontRegular.name
                 font.pixelSize: 14
-                color: datePicker.error ? errorColor : parent.headerFontColor
-                selectionColor: MoneroComponents.Style.dimmedFontColor
-                selectByMouse: true
-                horizontalAlignment: TextInput.AlignHCenter
+                color: datePicker.error ? errorColor : MoneroComponents.Style.defaultFontColor
                 maximumLength: 4
+                horizontalAlignment: TextInput.AlignHCenter
                 validator: IntValidator{bottom: 1000; top: 9999;}
                 text: if(datePicker.showCurrentDate) datePicker.currentDate.getFullYear()
-
                 onFocusChanged: {
                     if(focus === false) {
                         var d = new Date()
@@ -215,238 +245,151 @@ 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
-                }
-            }
         }
     }
 
-    QtQuickControls2.Popup {
-        id: popup
-        padding: 0
-        closePolicy: QtQuickControls2.Popup.CloseOnEscape | QtQuickControls2.Popup.CloseOnPressOutsideParent
+    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 }
+        }
 
         Rectangle {
-            id: calendarRect
-            width: head.width
-            x: head.x
-            y: head.y + head.height + 10
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.leftMargin: 1
+            anchors.rightMargin: 1
+            anchors.top: parent.top
+            color: "#FFFFFF"
+            height: 1
+        }
 
-            color: MoneroComponents.Style.middlePanelBackgroundColor
-            border.width: 1
-            border.color: MoneroComponents.Style.appWindowBorderColor
-            height: datePicker.expanded ? calendar.height + 2 : 0
-            clip: true
+        Calendar {
+            id: calendar
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.top: parent.top
+            anchors.margins: 1
+            height: 180
+            frameVisible: false
 
-            Behavior on height {
-                NumberAnimation { duration: 100; easing.type: Easing.InQuad }
-            }
+            style: CalendarStyle {
+                gridVisible: false
+                background: Rectangle { color: "transparent" }
+                dayDelegate: Item {
+                    z: parent.z + 1
+                    implicitHeight: implicitWidth
+                    implicitWidth: calendar.width / 7
 
-            MouseArea {
-                anchors.fill: parent
-            }
+                    Rectangle {
+                        anchors.fill: parent
+                        radius: parent.implicitHeight / 2
+                        color: dayArea.pressed && styleData.visibleMonth ? "#FF6C3B" : "transparent"
+                    }
 
-            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";
-                            }
+                    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"
                         }
+                    }
 
-                        MoneroComponents.TextPlain {
-                            id: dayText
+                    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()
+                            }
+
+                            dateChanged();
+                        }
+                    }
+                }
+
+                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
-                            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
-                            }
+                            source: "../images/prevMonth.png"
                         }
 
                         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();
-                            }
+                            onClicked: calendar.showPreviousMonth()
                         }
                     }
 
-                    dayOfWeekDelegate: Item {
-                        implicitHeight: 20
-                        implicitWidth: calendar.width / 7
+                    Item {
+                        anchors.right: parent.right
+                        anchors.top: parent.top
+                        anchors.bottom: parent.bottom
+                        width: height
 
-                        MoneroComponents.TextPlain {
+                        Image {
                             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
+                            source: "../images/nextMonth.png"
                         }
 
-
-                        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
-                            }
-
-                            ColorOverlay {
-                                source: prevMonthIcon
-                                anchors.fill: prevMonthIcon
-                                color: MoneroComponents.Style.defaultFontColor
-                                opacity: 0.5
-                            }
-
-                            MouseArea {
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                anchors.fill: parent
-                                onClicked: calendar.showPreviousMonth()
-                            }
-                        }
-
-                        Item {
-                            anchors.right: parent.right
-                            anchors.rightMargin: 4
-                            anchors.top: parent.top
-                            anchors.bottom: parent.bottom
-                            width: height
-
-                            Image {
-                                id: nextMonthIcon
-                                anchors.centerIn: parent
-                                source: "qrc:///images/prevMonth.png"
-                                visible: false
-                            }
-
-                            ColorOverlay {
-                                source: nextMonthIcon
-                                anchors.fill: nextMonthIcon
-                                color: MoneroComponents.Style.defaultFontColor
-                                opacity: 0.5
-                                rotation: 180
-                            }
-
-                            MouseArea {
-                                hoverEnabled: true
-                                cursorShape: Qt.PointingHandCursor
-                                anchors.fill: parent
-                                onClicked: calendar.showNextMonth()
-                            }
+                        MouseArea {
+                            anchors.fill: parent
+                            onClicked: calendar.showNextMonth()
                         }
                     }
                 }

components/HistoryTable.qml

@@ -0,0 +1,484 @@
+// 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

@@ -0,0 +1,91 @@
+// 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.dimmedFontColor
+    }
+
+    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.dimmedFontColor
+            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

@@ -0,0 +1,222 @@
+// 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,33 +26,49 @@
 // 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
 
-MoneroEffects.ImageMask {
-    id: button
-    z: 666
-    color: MoneroComponents.Style.defaultFontColor
-    image: ""
+import QtQuick 2.0
+
+Item {
+    property alias image : buttonImage
+    property alias imageSource : buttonImage.source
 
     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
 
-        onEntered: {
-            button.width = button.width + 2
-            button.height = button.height + 2
+        onPressed: {
+            buttonImage.x = buttonImage.x + 2
+            buttonImage.y = buttonImage.y + 2
+        }
+        onReleased: {
+            buttonImage.x = buttonImage.x - 2
+            buttonImage.y = buttonImage.y - 2
         }
 
-        onExited: {
-            button.width = button.width - 2
-            button.height = button.height - 2
+        onClicked: {
+            parent.clicked(mouse)
         }
-
-        onClicked: button.clicked(mouse)
     }
+
 }

components/InlineButton.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2015, The Monero Project
 //
 // All rights reserved.
 //
@@ -26,33 +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.9
+import QtQuick 2.0
 import QtQuick.Layouts 1.1
-import QtGraphicalEffects 1.0
 
-import "." as MoneroComponents
-import "./effects/" as MoneroEffects
+import "../components" as MoneroComponents
 
 Item {
     id: inlineButton
-    height: parent.height
-    anchors.top: parent.top
-    anchors.bottom: parent.bottom
-
-    property bool small: false
+    height: rect.height * scaleRatio
     property string shadowPressedColor: "#B32D00"
     property string shadowReleasedColor: "#FF4304"
     property string pressedColor: "#FF4304"
     property string releasedColor: "#FF6C3C"
     property string icon: ""
-    property string textColor: MoneroComponents.Style.inlineButtonTextColor
-    property int fontSize: small ? 14 : 16
-    property int rectHeight: small ? 24 : 24
-    property int rectHMargin: small ? 16 : 22
+    property string textColor: "#FFFFFF"
+    property int fontSize: 12 * scaleRatio
     property alias text: inlineText.text
-    property alias fontPixelSize: inlineText.font.pixelSize
-    property alias fontFamily: inlineText.font.family
-    property alias buttonColor: rect.color
     signal clicked()
 
     function doClick() {
@@ -63,37 +52,23 @@ Item {
 
     Rectangle{
         id: rect
-        color: MoneroComponents.Style.buttonInlineBackgroundColor
-        height: 24
-        width: inlineText.text ? (inlineText.width + 16) : inlineButton.icon ? (inlineImage.width + 16) : rect.height
+        color: MoneroComponents.Style.buttonBackgroundColorDisabled
+        border.color: "black"
+        height: 28 * scaleRatio
+        width: inlineText.width + 22 * scaleRatio
         radius: 4
 
-        anchors.verticalCenter: parent.verticalCenter
+        anchors.top: parent.top
         anchors.right: parent.right
-        anchors.rightMargin: 4
 
-        MoneroComponents.TextPlain {
+        Text {
             id: inlineText
             font.family: MoneroComponents.Style.fontBold.name
             font.bold: true
-            font.pixelSize: inlineButton.fontSize
-            color: inlineButton.textColor
+            font.pixelSize: 16 * scaleRatio
+            color: "black"
             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 {
@@ -103,30 +78,16 @@ Item {
             anchors.fill: parent
             onClicked: doClick()
             onEntered: {
-                rect.color = buttonColor ? buttonColor : "#707070";
+                rect.color = "#707070";
                 rect.opacity = 0.8;
             }
             onExited: {
                 rect.opacity = 1.0;
-                rect.color = buttonColor ? buttonColor : "#808080";
+                rect.color = "#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,30 +27,21 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import QtQuick.Controls 2.0
-import QtQuick 2.9
+import QtQuick 2.7
 
 import "../components" as MoneroComponents
 
 TextField {
-    id: textField
     font.family: MoneroComponents.Style.fontRegular.name
-    font.pixelSize: 18
+    font.pixelSize: 18 * scaleRatio
     font.bold: true
     horizontalAlignment: TextInput.AlignLeft
     selectByMouse: true
     color: MoneroComponents.Style.defaultFontColor
-    selectionColor: MoneroComponents.Style.textSelectionColor
-    selectedTextColor: MoneroComponents.Style.textSelectedColor
+    selectionColor: MoneroComponents.Style.dimmedFontColor
+    selectedTextColor: MoneroComponents.Style.defaultFontColor
 
     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.9
+import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
@@ -45,19 +45,22 @@ Item {
     signal accepted()
     signal rejected()
 
-    function open(prepopulate) {
+    function open() {
+        inactiveOverlay.visible = true
         leftPanel.enabled = false
         middlePanel.enabled = false
-        titleBar.state = "essentials"
+        titleBar.enabled = false
+        show()
         root.visible = true;
         input.focus = true;
-        input.text = prepopulate ? prepopulate : "";
+        input.text = "";
     }
 
     function close() {
+        inactiveOverlay.visible = false
         leftPanel.enabled = true
         middlePanel.enabled = true
-        titleBar.state = "default"
+        titleBar.enabled = true
         root.visible = false;
     }
 
@@ -72,44 +75,44 @@ Item {
 
             Layout.fillWidth: true
             Layout.alignment: Qt.AlignHCenter
-            Layout.maximumWidth: 400
+            Layout.maximumWidth: 400 * scaleRatio
 
             Label {
                 id: label
+                anchors.left: parent.left
                 Layout.fillWidth: true
 
-                font.pixelSize: 16
+                font.pixelSize: 16 * scaleRatio
                 font.family: MoneroComponents.Style.fontLight.name
 
                 color: MoneroComponents.Style.defaultFontColor
             }
 
-            MoneroComponents.Input {
+            TextField {
                 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
+                font.pixelSize: 24 * scaleRatio
                 KeyNavigation.tab: okButton
                 bottomPadding: 10
                 leftPadding: 10
                 topPadding: 10
                 color: MoneroComponents.Style.defaultFontColor
-                selectionColor: MoneroComponents.Style.textSelectionColor
-                selectedTextColor: MoneroComponents.Style.textSelectedColor
+                selectionColor: MoneroComponents.Style.dimmedFontColor
+                selectedTextColor: MoneroComponents.Style.defaultFontColor
 
                 background: Rectangle {
                     radius: 2
-                    border.color: MoneroComponents.Style.inputBorderColorActive
+                    border.color: Qt.rgba(255, 255, 255, 0.35)
                     border.width: 1
-                    color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
+                    color: "black"
                 }
 
-                Keys.enabled: root.visible
-                Keys.onEnterPressed: Keys.onReturnPressed(event)
                 Keys.onReturnPressed: {
                     root.close()
                     root.accepted()
@@ -123,7 +126,7 @@ Item {
             // Ok/Cancel buttons
             RowLayout {
                 id: buttons
-                spacing: 16
+                spacing: 16 * scaleRatio
                 Layout.topMargin: 16
                 Layout.alignment: Qt.AlignRight
 
@@ -144,7 +147,7 @@ Item {
                     small: true
                     width: 120
                     fontSize: 14
-                    text: qsTr("Ok") + translationManager.emptyString
+                    text: qsTr("Ok")
                     KeyNavigation.tab: cancelButton
                     onClicked: {
                         root.close()

components/InputMulti.qml

@@ -27,13 +27,13 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import QtQuick.Controls 2.0
-import QtQuick 2.9
+import QtQuick 2.7
 
 import "../js/TxUtils.js" as TxUtils
 import "../components" as MoneroComponents
 
 TextArea {
-    property int fontSize: 18
+    property int fontSize: 18 * scaleRatio
     property bool fontBold: false
     property string fontColor: MoneroComponents.Style.defaultFontColor
 
@@ -48,32 +48,17 @@ TextArea {
     font.bold: fontBold
     horizontalAlignment: TextInput.AlignLeft
     selectByMouse: mouseSelection
-    selectionColor: MoneroComponents.Style.textSelectionColor
-    selectedTextColor: MoneroComponents.Style.textSelectedColor
-
-    property int minimumHeight: 100
-    height: contentHeight > minimumHeight ? contentHeight : minimumHeight
+    selectionColor: MoneroComponents.Style.dimmedFontColor
+    selectedTextColor: MoneroComponents.Style.defaultFontColor
 
     onTextChanged: {
         if(addressValidation){
             // js replacement for `RegExpValidator { regExp: /[0-9A-Fa-f]{95}/g }`
-            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);
+            textArea.text = textArea.text.replace(/[^a-z0-9.@]/gi,'');
+            var address_ok = TxUtils.checkAddress(textArea.text, appWindow.persistentSettings.nettype);
             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.9
+import QtQuick 2.5
 import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
@@ -35,27 +35,24 @@ Item {
     id: item
     property alias text: label.text
     property alias color: label.color
-    property int textFormat: Text.PlainText
+    property alias textFormat: label.textFormat
     property string tipText: ""
-    property int fontSize: 16
+    property int fontSize: 16 * scaleRatio
     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 elide: label.elide
-    property alias textWidth: label.width
-    property alias styleName: label.font.styleName
-    property alias themeTransition: label.themeTransition
+    property alias hoveredLink: label.hoveredLink
     signal linkActivated()
-    height: label.height
-    width: label.width
-    Layout.topMargin: 10
+    height: label.height * scaleRatio
+    width: label.width * scaleRatio
+    Layout.topMargin: 10 * scaleRatio
 
-    MoneroComponents.TextPlain {
+    Text {
         id: label
         anchors.bottom: parent.bottom
-        anchors.bottomMargin: 2
+        anchors.bottomMargin: 2 * scaleRatio
         anchors.left: parent.left
         font.family: {
             if(fontFamily){
@@ -68,11 +65,5 @@ 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.9
+import QtQuick 2.0
 import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
@@ -37,14 +37,14 @@ Rectangle {
     property alias text: labelButtonText.text
 
     id: labelButton
-    color: MoneroComponents.Style.buttonBackgroundColorDisabled
+    color: "#808080"
     radius: 3
     height: 20
     width: labelButtonText.width + 14
     anchors.right: copyButton.left
     anchors.rightMargin: 6
 
-    MoneroComponents.TextPlain {
+    Text {
         id: labelButtonText
         anchors.verticalCenter: parent.verticalCenter
         anchors.horizontalCenter: parent.horizontalCenter
@@ -52,7 +52,7 @@ Rectangle {
         font.pixelSize: 12
         font.bold: true
         text: ""
-        color: MoneroComponents.Style.inlineButtonTextColor
+        color: "black"
     }
 
     MouseArea {
@@ -61,11 +61,11 @@ Rectangle {
         hoverEnabled: true
         onClicked: labelButton.clicked()
         onEntered: {
-            labelButton.color = MoneroComponents.Style.buttonBackgroundColorDisabledHover;
+            labelButton.color = "#707070";
             labelButtonText.opacity = 0.8;
         }
         onExited: {
-            labelButton.color = MoneroComponents.Style.buttonBackgroundColorDisabled;
+            labelButton.color = "#808080";
             labelButtonText.opacity = 1.0;
         }
     }

components/LabelSubheader.qml

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

components/LanguageSidebar.qml

@@ -1,170 +0,0 @@
-// Copyright (c) 2014-2019, The Monero Project
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-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: "#0d0d0d"
-        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
-
-                MoneroComponents.TextPlain {
-                    anchors.left: parent.left
-                    anchors.leftMargin: 16
-                    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 + " (" + locale_spl[1] + ") ";
-                            sideBar.close()
-                        }
-                        hoverEnabled: true
-                        onEntered: {
-                            // item.color = "#26FFFFFF"
-                            parent.opacity = 1
-                        }
-                        onExited: {
-                            // item.color = "transparent"
-                            parent.opacity = 0.65
-                        }
-                    }
-                }
-            }
-
-            ScrollIndicator.vertical: ScrollIndicator {
-                // @TODO: QT 5.9 introduces `policy: ScrollBar.AlwaysOn`
-                active: true
-                contentItem.opacity: 0.7
-                onActiveChanged: {
-                    if (!active) {
-                        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,25 +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.9
-import QtGraphicalEffects 1.0
+import QtQuick 2.0
 
 import "../components" as MoneroComponents
 
 Item {
     id: item
-    property alias input: input
     property alias text: input.text
 
     property alias placeholderText: placeholderLabel.text
     property bool placeholderCenter: false
     property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name
     property bool placeholderFontBold: false
-    property int placeholderFontSize: 18
+    property int placeholderFontSize: 18 * scaleRatio
     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
@@ -53,21 +50,17 @@ Item {
     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(error && input.text !== ""){
-            return MoneroComponents.Style.inputBorderColorInvalid;
-        } else if(input.activeFocus){
+        if(input.activeFocus){
             return MoneroComponents.Style.inputBorderColorActive;
         } else {
             return MoneroComponents.Style.inputBorderColorInActive;
         }
     }
 
-    property int fontSize: 18
+    property int fontSize: 18 * scaleRatio
     property bool fontBold: false
     property alias fontColor: input.color
     property bool error: false
@@ -76,19 +69,19 @@ Item {
     property alias labelTextFormat: inputLabel.textFormat
     property string backgroundColor: "transparent"
     property string tipText: ""
-    property int labelFontSize: 16
+    property int labelFontSize: 16 * scaleRatio
     property bool labelFontBold: false
     property alias labelWrapMode: inputLabel.wrapMode
     property alias labelHorizontalAlignment: inputLabel.horizontalAlignment
     property bool showingHeader: inputLabel.text !== "" || copyButton
-    property int inputHeight: 42
+    property int inputHeight: 42 * scaleRatio
 
     signal labelLinkActivated(); // input label, rich text <a> signal
     signal editingFinished();
     signal accepted();
     signal textUpdated();
 
-    height: showingHeader ? (inputLabel.height + inputItem.height + 2) : 42
+    height: showingHeader ? (inputLabel.height + inputItem.height + 2) * scaleRatio : 42 * scaleRatio
 
     onTextUpdated: {
         // check to remove placeholder text when there is content
@@ -109,11 +102,12 @@ Item {
         }
     }
 
-    MoneroComponents.TextPlain {
+    Text {
         id: inputLabel
         anchors.top: parent.top
         anchors.left: parent.left
-        font.family: MoneroComponents.Style.fontRegular.name
+        anchors.topMargin: 2 * scaleRatio
+        font.family: MoneroComponents.Style.fontLight.name
         font.pixelSize: labelFontSize
         font.bold: labelFontBold
         textFormat: Text.RichText
@@ -129,7 +123,7 @@ Item {
 
     MoneroComponents.LabelButton {
         id: copyButtonId
-        text: qsTr("Copy") + translationManager.emptyString
+        text: qsTr("Copy")
         anchors.right: parent.right
         onClicked: {
             if (input.text.length > 0) {
@@ -143,13 +137,13 @@ Item {
 
     Item{
         id: inputItem
-        height: inputHeight
+        height: inputHeight * scaleRatio
         anchors.top: showingHeader ? inputLabel.bottom : parent.top
-        anchors.topMargin: showingHeader ? 12 : 2
+        anchors.topMargin: showingHeader ? 12 * scaleRatio : 2 * scaleRatio
         width: parent.width
         clip: true
 
-        MoneroComponents.TextPlain {
+        Text {
             id: placeholderLabel
             visible: input.text ? false : true
             anchors.verticalCenter: parent.verticalCenter
@@ -159,14 +153,14 @@ Item {
                 if(placeholderCenter){
                     return undefined;
                 }
-                else if(inlineIcon.visible){ return 50; }
-                else { return 10; }
+                else if(inlineIcon.visible){ return 50 * scaleRatio; }
+                else { return 10 * scaleRatio; }
             }
 
             opacity: item.placeholderOpacity
             color: item.placeholderColor
             font.family: item.placeholderFontFamily
-            font.pixelSize: placeholderFontSize
+            font.pixelSize: placeholderFontSize * scaleRatio
             font.bold: item.placeholderFontBold
             text: ""
             z: 3
@@ -174,7 +168,7 @@ Item {
 
         Rectangle {
             anchors.fill: parent
-            anchors.topMargin: 1
+            anchors.topMargin: 1 * scaleRatio
             color: "transparent"
         }
 
@@ -189,34 +183,36 @@ Item {
 
         Image {
             id: inlineIcon
-            width: 26
-            height: 26
+            width: 26 * scaleRatio
+            height: 26 * scaleRatio
             anchors.top: parent.top
-            anchors.topMargin: 8
+            anchors.topMargin: 8 * scaleRatio
             anchors.left: parent.left
-            anchors.leftMargin: 12
-            source: "qrc:///images/moneroIcon-28x28.png"
+            anchors.leftMargin: 12 * scaleRatio
+            source: "../images/moneroIcon-28x28.png"
             visible: false
         }
 
         MoneroComponents.Input {
             id: input
             anchors.fill: parent
-            anchors.leftMargin: inlineIcon.visible ? 44 : 0
+            anchors.leftMargin: inlineIcon.visible ? 44 * scaleRatio : 0
             font.pixelSize: item.fontSize
             font.bold: item.fontBold
             onEditingFinished: item.editingFinished()
             onAccepted: item.accepted();
             onTextChanged: item.textUpdated()
-            topPadding: 10
-            bottomPadding: 10
+            topPadding: 10 * scaleRatio
+            bottomPadding: 10 * scaleRatio
         }
 
         MoneroComponents.InlineButton {
             id: inlineButtonId
             visible: item.inlineButtonText ? true : false
             anchors.right: parent.right
-            anchors.rightMargin: 8
+            anchors.rightMargin: 8 * scaleRatio
+            anchors.top: parent.top
+            anchors.topMargin: 6 * scaleRatio
         }
     }
 }

components/LineEditMulti.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2015, 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.9
+import QtQuick 2.0
 import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
@@ -35,22 +35,17 @@ ColumnLayout {
     id: item
 
     Layout.fillWidth: true
+    Layout.preferredHeight: childrenRect.height
 
     property alias text: input.text
     property alias labelText: inputLabel.text
     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 int placeholderFontSize: 18 * scaleRatio
     property string placeholderColor: MoneroComponents.Style.defaultFontColor
     property real placeholderOpacity: 0.35
 
@@ -69,25 +64,21 @@ ColumnLayout {
 
     property string labelFontColor: MoneroComponents.Style.defaultFontColor
     property bool labelFontBold: false
-    property int labelFontSize: 16
+    property int labelFontSize: 16 * scaleRatio
     property bool labelButtonVisible: false
 
-    property string fontColor: MoneroComponents.Style.defaultFontColor
+    property string fontColor: "white"
     property bool fontBold: false
-    property int fontSize: 16
+    property int fontSize: 16 * scaleRatio
 
     property bool mouseSelection: true
     property alias readOnly: input.readOnly
     property bool copyButton: false
-    property bool pasteButton: false
-    property bool showingHeader: labelText != "" || copyButton || pasteButton
+    property bool showingHeader: true
     property var wrapMode: Text.NoWrap
     property alias addressValidation: input.addressValidation
     property string backgroundColor: "" // mock
 
-    property alias inlineButton: inlineButtonId
-    property bool inlineButtonVisible: false
-
     signal labelButtonClicked();
     signal inputLabelLinkActivated();
     signal editingFinished();
@@ -97,10 +88,10 @@ ColumnLayout {
         id: inputLabelRect
         color: "transparent"
         Layout.fillWidth: true
-        height: (inputLabel.height + 10)
+        height: (inputLabel.height + 10) * scaleRatio
         visible: showingHeader ? true : false
 
-        MoneroComponents.TextPlain {
+        Text {
             id: inputLabel
             anchors.top: parent.top
             anchors.left: parent.left
@@ -118,38 +109,25 @@ ColumnLayout {
             }
         }
 
-        RowLayout {
-            anchors.right: parent.right
-            spacing: 16
+        MoneroComponents.LabelButton {
+            id: labelButton
+            onClicked: labelButtonClicked()
+            visible: labelButtonVisible
+        }
 
-            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: copyButtonId
+            visible: copyButton && input.text !== ""
+            text: qsTr("Copy")
+            anchors.right: labelButton.visible ? inputLabel.right : parent.right
+            anchors.rightMargin: labelButton.visible? 4 : 0
+            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
-            }
         }
     }
 
@@ -157,13 +135,10 @@ ColumnLayout {
         id: input
         readOnly: false
         addressValidation: false
+        anchors.top: item.showingHeader ? inputLabelRect.bottom : item.top
         Layout.fillWidth: true
-        
-        leftPadding: item.inputPaddingLeft
-        rightPadding: item.inputPaddingRight
-        topPadding: item.inputPaddingTop
-        bottomPadding: item.inputPaddingBottom
-
+        topPadding: item.showingHeader ? 10 * scaleRatio : 0
+        bottomPadding: 10 * scaleRatio
         wrapMode: item.wrapMode
         fontSize: item.fontSize
         fontBold: item.fontBold
@@ -172,12 +147,12 @@ ColumnLayout {
         onEditingFinished: item.editingFinished()
         error: item.error
 
-        MoneroComponents.TextPlain {
+        Text {
             id: placeholderLabel
             visible: input.text ? false : true
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
-            anchors.leftMargin: 10
+            anchors.leftMargin: 10 * scaleRatio
             opacity: item.placeholderOpacity
             color: item.placeholderColor
             font.family: item.placeholderFontFamily
@@ -191,16 +166,9 @@ ColumnLayout {
             color: "transparent"
             border.width: 1
             border.color: item.borderColor
-            radius: item.inputRadius
+            radius: 4
             anchors.fill: parent
             visible: !item.borderDisabled
         }
-
-        MoneroComponents.InlineButton {
-            id: inlineButtonId
-            visible: (inlineButtonId.text || inlineButtonId.icon) && inlineButtonVisible ? true : false
-            anchors.right: parent.right
-            anchors.rightMargin: 8
-        }
     }
 }

components/MenuButton.qml

@@ -26,16 +26,15 @@
 // 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 QtQuick 2.5
 
 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
@@ -47,11 +46,12 @@ Rectangle {
         clicked();
     }
 
+
     function getOffset() {
         var offset = 0
         var item = button
         while (item.under) {
-            offset += 20
+            offset += 20 * scaleRatio
             item = item.under
         }
         return offset
@@ -59,76 +59,77 @@ Rectangle {
 
     color: "transparent"
     property bool present: !under || under.checked || checked || under.numSelectedChildren > 0
-    height: present ? ((appWindow.height >= 800) ? 44  : 38 ) : 0
+    height: present ? ((appWindow.height >= 800) ? 44 * scaleRatio  : 38 * scaleRatio ) : 0
 
-    LinearGradient {
-        visible: isOpenGL && button.checked
+    // button gradient while checked
+    Image {
         height: parent.height
         width: 260
         anchors.verticalCenter: parent.verticalCenter
         anchors.right: parent.right
         anchors.rightMargin: -20
         anchors.leftMargin: parent.getOffset()
-        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 }
-        }
-    }
-
-    // fallback hover effect when opengl is not available
-    Rectangle {
-        visible: !isOpenGL && button.checked
-        anchors.fill: parent
-        color: MoneroComponents.Style.menuButtonFallbackBackgroundColor
+        source: "../images/menuButtonGradient.png"
+        visible: button.checked
     }
 
     // button decorations that are subject to leftMargin offsets
     Rectangle {
         anchors.left: parent.left
-        anchors.leftMargin: 20
+        anchors.leftMargin: parent.getOffset() + 20 * scaleRatio
         height: parent.height
-        width: 2
-        color: button.checked ? MoneroComponents.Style.buttonBackgroundColor : "transparent"
+        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
+            }
+        }
 
         // button text
-        MoneroComponents.TextPlain {
+        Text {
             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: button.getOffset() + 8
+            anchors.leftMargin: 8 * scaleRatio
+            font.family: MoneroComponents.Style.fontMedium.name
             font.bold: true
-            font.pixelSize: 14
+            font.pixelSize: 16 * scaleRatio
+            color: "#FFFFFF"
         }
     }
 
     // menu button right arrow
-    MoneroEffects.ImageMask {
+    Image {
         anchors.verticalCenter: parent.verticalCenter
-        anchors.leftMargin: parent.getOffset()
         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
+        anchors.rightMargin: 20 * scaleRatio
+        anchors.leftMargin: parent.getOffset()
+        source: "../images/right.png"
+        opacity: button.checked ? 1.0 : 0.4
     }
 
-    MoneroComponents.TextPlain {
+    Text {
         id: symbolText
         anchors.right: parent.right
-        anchors.rightMargin: 44
+        anchors.rightMargin: 44 * scaleRatio
         anchors.verticalCenter: parent.verticalCenter
-        font.pixelSize: 12
+        font.pixelSize: 12 * scaleRatio
         font.bold: true
-        color: MoneroComponents.Style.menuButtonTextColor
+        color: button.checked || buttonArea.containsMouse ? "#FFFFFF" : dot.color
         visible: appWindow.ctrlPressed
-        themeTransition: false
     }
 
     MouseArea {

components/MenuButtonDivider.qml

@@ -1,15 +0,0 @@
-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

@@ -0,0 +1,118 @@
+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,10 +26,9 @@
 // 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 2.0
 import QtQuick.Layouts 1.1
 
-import FontAwesome 1.0
 import moneroComponents.Wallet 1.0
 import "../components" as MoneroComponents
 
@@ -39,34 +38,28 @@ Rectangle {
     property var connected: Wallet.ConnectionStatus_Disconnected
 
     function getConnectionStatusString(status) {
-        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_Connected) {
+            if(!appWindow.daemonSynced)
+                return qsTr("Synchronizing")
+            if(appWindow.remoteNodeConnected)
+                return qsTr("Remote node")
+            return qsTr("Connected")
         }
+        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
+        Layout.preferredHeight: 40 * scaleRatio
 
         Item {
             id: iconItem
-            width: 40
-            height: 40
+            anchors.top: parent.top
+            width: 40 * scaleRatio
+            height: 40 * scaleRatio
             opacity: {
                 if(item.connected == Wallet.ConnectionStatus_Connected){
                     return 1
@@ -77,122 +70,50 @@ Rectangle {
 
             Image {
                 anchors.top: parent.top
-                anchors.topMargin: !appWindow.isMining ? 6 : 4
+                anchors.topMargin: 6
                 anchors.right: parent.right
-                anchors.rightMargin: !appWindow.isMining ? 11 : 0
+                anchors.rightMargin: 11
                 source: {
-                    if(appWindow.isMining) {
-                       return "qrc:///images/miningxmr.png"
-                    } else if(item.connected == Wallet.ConnectionStatus_Connected) {
-                        return "qrc:///images/lightning.png"
+                    if(item.connected == Wallet.ConnectionStatus_Connected){
+                        return "../images/lightning.png"
                     } else {
-                        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")
-                        }
+                        return "../images/lightning-white.png"
                     }
                 }
             }
         }
 
         Item {
-            height: 40
-            width: 260
+            anchors.top: parent.top
+            anchors.left: iconItem.right
+            height: 40 * scaleRatio
+            width: 260 * scaleRatio
 
-            MoneroComponents.TextPlain {
+            Text {
                 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
-                color: MoneroComponents.Style.dimmedFontColor
-                opacity: MoneroComponents.Style.blackTheme ? 0.65 : 0.5
+                font.pixelSize: 13 * scaleRatio
+                color: "white"
+                opacity: 0.5
                 text: qsTr("Network status") + translationManager.emptyString
-                themeTransition: false
             }
 
-            MoneroComponents.TextPlain {
+            Text {
                 id: statusTextVal
                 anchors.left: parent.left
                 anchors.top: parent.top
                 anchors.topMargin: 14
                 font.family: MoneroComponents.Style.fontMedium.name
-                font.pixelSize: 20
-                color: MoneroComponents.Style.defaultFontColor
+                font.pixelSize: 20 * scaleRatio
+                color: "white"
                 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

@@ -0,0 +1,248 @@
+// 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/Notifier.qml

@@ -26,17 +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.9
+import QtQuick 2.0
 import QtQuick.Controls 1.4
 import moneroComponents.Wallet 1.0
-import "." as MoneroComponents
 
 Item {
     id: item
     property string message: ""
     property bool active: false
-    height: 180
-    width: 320
+    height: 120
+    width: 240
     property int margin: 15
     x: parent.width - width - margin
     y: parent.height - height * scale.yScale - margin * scale.yScale
@@ -52,12 +51,11 @@ Item {
             backgroundVisible: false
             textFormat: TextEdit.AutoText
             anchors.fill: parent
-            font.family: MoneroComponents.Style.fontRegular.name
+            font.family: "Arial"
             font.pixelSize: 12
             textMargin: 20
             textColor: "white"
             text: item.message
-            wrapMode: Text.WrapAnywhere
         }
     }
 
@@ -72,7 +70,7 @@ Item {
 
     Timer {
         id: hider
-        interval: 30000; running: false; repeat: false
+        interval: 12000; running: false; repeat: false
         onTriggered: { item.active = false }
     }
 

components/PasswordDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 //
 // All rights reserved.
 //
@@ -26,369 +26,124 @@
 // 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 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 FontAwesome 1.0
 
-import "." as MoneroComponents
-import "effects/" as MoneroEffects
-import "../js/Utils.js" as Utils
+import "../components" as MoneroComponents
 
 Item {
     id: root
     visible: false
     z: parent.z + 2
 
-    property bool isHidden: true
-    property alias password: passwordInput1.text
+    property alias password: passwordInput.text
     property string walletName
-    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 _openInit(walletName, errorText) {
-        isHidden = true
-        capsLockTextLabel.visible = oshelper.isCapsLock();
-        passwordInput1.echoMode = TextInput.Password
-        passwordInput2.echoMode = TextInput.Password
-        passwordInput1.text = ""
-        passwordInput2.text = ""
-        passwordInput1.forceActiveFocus();
+    function open(walletName) {
+        inactiveOverlay.visible = true // draw appwindow inactive
         root.walletName = walletName ? walletName : ""
-        errorTextLabel.text = errorText ? errorText : "";
         leftPanel.enabled = false
         middlePanel.enabled = false
-        wizard.enabled = false
-        titleBar.state = "essentials"
+        titleBar.enabled = false
+        show()
         root.visible = true;
-        appWindow.hideBalanceForced = true;
-        appWindow.updateBalance();
-    }
-
-    function open(walletName, errorText) {
-        passwordDialogMode = true;
-        passphraseDialogMode = false;
-        newPasswordDialogMode = false;
-        _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);
+        passwordInput.forceActiveFocus();
+        passwordInput.text = ""
     }
 
     function close() {
+        inactiveOverlay.visible = false
         leftPanel.enabled = true
         middlePanel.enabled = true
-        wizard.enabled = true
-        titleBar.state = "default"
-
+        titleBar.enabled = true
         root.visible = false;
-        appWindow.hideBalanceForced = false;
-        appWindow.updateBalance();
         closeCallback();
     }
 
-    function toggleIsHidden() {
-        passwordInput1.echoMode = isHidden ? TextInput.Normal : TextInput.Password;
-        passwordInput2.echoMode = isHidden ? TextInput.Normal : TextInput.Password;
-        isHidden = !isHidden;
-    }
-
     ColumnLayout {
+        z: inactiveOverlay.z + 1
         id: mainLayout
         spacing: 10
-        anchors { fill: parent; margins: 35 }
+        anchors { fill: parent; margins: 35 * scaleRatio }
 
         ColumnLayout {
             id: column
 
             Layout.fillWidth: true
             Layout.alignment: Qt.AlignHCenter
-            Layout.maximumWidth: 400
+            Layout.maximumWidth: 400 * scaleRatio
 
             Label {
-                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;
-                    }
-                }
+                text: root.walletName.length > 0 ? qsTr("Please enter wallet password for: ") + root.walletName : qsTr("Please enter wallet password")
+                anchors.left: parent.left
                 Layout.fillWidth: true
 
-                font.pixelSize: 16
+                font.pixelSize: 16 * scaleRatio
                 font.family: MoneroComponents.Style.fontLight.name
 
                 color: MoneroComponents.Style.defaultFontColor
             }
 
-            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.Input {
-                id: passwordInput1
+            TextField {
+                id : passwordInput
                 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
-                echoMode: TextInput.Password
-                KeyNavigation.tab: {
-                    if (passwordDialogMode) {
-                        return okButton
-                    } else {
-                        return passwordInput2
-                    }
-                }
-                implicitHeight: 50
-                bottomPadding: 10
-                leftPadding: 10
-                topPadding: 10
-                color: MoneroComponents.Style.defaultFontColor
-                selectionColor: MoneroComponents.Style.textSelectionColor
-                selectedTextColor: MoneroComponents.Style.textSelectedColor
-                onTextChanged: capsLockTextLabel.visible = oshelper.isCapsLock();
-
-                background: Rectangle {
-                    radius: 2
-                    color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
-                    border.color: MoneroComponents.Style.inputBorderColorInActive
-                    border.width: 1
-
-                    MoneroEffects.ColorTransition {
-                        targetObj: parent
-                        blackColor: "black"
-                        whiteColor: "#A9FFFFFF"
-                    }
-
-                    MoneroComponents.Label {
-                        fontSize: 20
-                        text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
-                        opacity: 0.7
-                        fontFamily: FontAwesome.fontFamily
-                        anchors.right: parent.right
-                        anchors.rightMargin: 15
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.verticalCenterOffset: 1
-
-                        MouseArea {
-                            anchors.fill: parent
-                            cursorShape: Qt.PointingHandCursor
-                            hoverEnabled: true
-                            onClicked: {
-                                toggleIsHidden();
-                            }
-                            onEntered: {
-                                parent.opacity = 0.9
-                                parent.fontSize = 24
-                            }
-                            onExited: {
-                                parent.opacity = 0.7
-                                parent.fontSize = 20
-                            }
-                        }
-                    }
-                }
-
-                Keys.enabled: root.visible
-                Keys.onEnterPressed: Keys.onReturnPressed(event)
-                Keys.onReturnPressed: {
-                    if (!passwordDialogMode && passwordInput1.text !== passwordInput2.text) {
-                        return;
-                    }
-                    root.close()
-                    if (passwordDialogMode) {
-                        root.accepted()
-                    } else if (newPasswordDialogMode) {
-                        root.acceptedNewPassword()
-                    } else if (passphraseDialogMode) {
-                        root.acceptedPassphrase()
-                    }
-                }
-                Keys.onEscapePressed: {
-                    root.close()
-                    if (passwordDialogMode) {
-                        root.rejected()
-                    } else if (newPasswordDialogMode) {
-                        root.rejectedNewPassword()
-                    } else if (passphraseDialogMode) {
-                        root.rejectedPassphrase()
-                    }
-                }
-            }
-
-            // 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.Input {
-                id: passwordInput2
-                visible: !passwordDialogMode
-                Layout.topMargin: 6
-                Layout.fillWidth: true
-                horizontalAlignment: TextInput.AlignLeft
-                verticalAlignment: TextInput.AlignVCenter
-                font.family: MoneroComponents.Style.fontLight.name
-                font.pixelSize: 24
+                font.pixelSize: 24 * scaleRatio
                 echoMode: TextInput.Password
                 KeyNavigation.tab: okButton
-                implicitHeight: 50
                 bottomPadding: 10
                 leftPadding: 10
                 topPadding: 10
                 color: MoneroComponents.Style.defaultFontColor
-                selectionColor: MoneroComponents.Style.textSelectionColor
-                selectedTextColor: MoneroComponents.Style.textSelectedColor
-                onTextChanged: capsLockTextLabel.visible = oshelper.isCapsLock();
+                selectionColor: MoneroComponents.Style.dimmedFontColor
+                selectedTextColor: MoneroComponents.Style.defaultFontColor
 
                 background: Rectangle {
                     radius: 2
-                    border.color: MoneroComponents.Style.inputBorderColorInActive
+                    border.color: Qt.rgba(255, 255, 255, 0.35)
                     border.width: 1
-                    color: MoneroComponents.Style.blackTheme ? "black" : "#A9FFFFFF"
+                    color: "black"
 
-                    MoneroComponents.Label {
-                        fontSize: 20
-                        text: isHidden ? FontAwesome.eye : FontAwesome.eyeSlash
-                        opacity: 0.7
-                        fontFamily: FontAwesome.fontFamily
-                        anchors.right: parent.right
-                        anchors.rightMargin: 15
+                    Image {
+                        width: 12
+                        height: 16
+                        source: "../images/lockIcon.png"
                         anchors.verticalCenter: parent.verticalCenter
-                        anchors.verticalCenterOffset: 1
-
-                        MouseArea {
-                            anchors.fill: parent
-                            cursorShape: Qt.PointingHandCursor
-                            hoverEnabled: true
-                            onClicked: {
-                                toggleIsHidden()
-                            }
-                            onEntered: {
-                                parent.opacity = 0.9
-                                parent.fontSize = 24
-                            }
-                            onExited: {
-                                parent.opacity = 0.7
-                                parent.fontSize = 20
-                            }
-                        }
+                        anchors.right: parent.right
+                        anchors.rightMargin: 20
                     }
                 }
 
                 Keys.enabled: root.visible
-                Keys.onEnterPressed: Keys.onReturnPressed(event)
                 Keys.onReturnPressed: {
-                    if (passwordInput1.text === passwordInput2.text) {
-                        root.close()
-                        if (newPasswordDialogMode) {
-                            root.acceptedNewPassword()
-                        } else if (passphraseDialogMode) {
-                            root.acceptedPassphrase()
-                        }
-                    }
+                    root.close()
+                    root.accepted()
+
                 }
                 Keys.onEscapePressed: {
                     root.close()
-                    if (newPasswordDialogMode) {
-                        root.rejectedNewPassword()
-                    } else if (passphraseDialogMode) {
-                        root.rejectedPassphrase()
-                    }
-                }
-            }
+                    root.rejected()
 
-            // 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
+                spacing: 16 * scaleRatio
                 Layout.topMargin: 16
                 Layout.alignment: Qt.AlignRight
 
@@ -396,37 +151,25 @@ Item {
                     id: cancelButton
                     small: true
                     text: qsTr("Cancel") + translationManager.emptyString
-                    KeyNavigation.tab: passwordInput1
+                    KeyNavigation.tab: passwordInput
                     onClicked: {
                         root.close()
-                        if (passwordDialogMode) {
-                            root.rejected()
-                        } else if (newPasswordDialogMode) {
-                            root.rejectedNewPassword()
-                        } else if (passphraseDialogMode) {
-                            root.rejectedPassphrase()
-                        }
+                        root.rejected()
                     }
                 }
 
                 MoneroComponents.StandardButton {
                     id: okButton
                     small: true
-                    text: qsTr("Ok") + translationManager.emptyString
+                    text: qsTr("Continue")
                     KeyNavigation.tab: cancelButton
-                    enabled: (passwordDialogMode == true) ? true : passwordInput1.text === passwordInput2.text
                     onClicked: {
                         root.close()
-                        if (passwordDialogMode) {
-                            root.accepted()
-                        } else if (newPasswordDialogMode) {
-                            root.acceptedNewPassword()
-                        } else if (passphraseDialogMode) {
-                            root.acceptedPassphrase()
-                        }
+                        root.accepted()
                     }
                 }
             }
+
         }
     }
 }

components/PrivacyLevel.qml

@@ -0,0 +1,153 @@
+// 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.
+
+// @TODO: Remove component after wizard redesign
+
+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

@@ -0,0 +1,193 @@
+// 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.
+
+// @TODO: Remove component after wizard redesign
+
+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,23 +26,21 @@
 // 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 2.0
 import QtQuick.Window 2.1
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 
-import "../components" as MoneroComponents
-
 Rectangle {
     id: root
-    color: MoneroComponents.Style.blackTheme ? "white" : "transparent"
+    color: "white"
     visible: false
-    z: 11
+    z:11
     property alias messageText: messageTitle.text
     property alias heightProgressText : heightProgress.text
 
-    width: 200
-    height: 100
+    width: 200 * scaleRatio
+    height: 100 * scaleRatio
     opacity: 0.7
 
     function show() {
@@ -60,40 +58,34 @@ Rectangle {
         anchors.right: parent.right
         anchors.verticalCenter: parent.verticalCenter
 
-        anchors.leftMargin: 30
-        anchors.rightMargin: 30
-
-        spacing: 12
+        anchors.leftMargin: 30 * scaleRatio
+        anchors.rightMargin: 30 * scaleRatio
 
         BusyIndicator {
             running: parent.visible
             Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
         }
 
-        MoneroComponents.TextPlain {
+        Text {
             id: messageTitle
             text: "Please wait..."
             font {
-                pixelSize: 22
+                pixelSize: 22 * scaleRatio
             }
             horizontalAlignment: Text.AlignHCenter
             Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
             Layout.fillWidth: true
-            themeTransition: false
-            color: "black"
         }
 
 
-        MoneroComponents.TextPlain {
+        Text {
             id: heightProgress
             font {
-                pixelSize: 18
+                pixelSize: 18 * scaleRatio
             }
             horizontalAlignment: Text.AlignHCenter
             Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
             Layout.fillWidth: true
-            themeTransition: false
-            color: "black"
         }
     }
 }

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.9
+import QtQuick 2.0
 import moneroComponents.Wallet 1.0
 
 import "../components" as MoneroComponents
@@ -46,71 +46,53 @@ Rectangle {
             fillLevel = progressLevel
             if(typeof statusTxt != "undefined" && statusTxt != "") {
                 progressText.text = statusTxt;
-                progressTextValue.text = "";
             } else {
-                progressText.text = syncText;
-                progressTextValue.text = remaining.toFixed(0);
+                progressText.text = syncText + remaining.toFixed(0);
             }
         }
     }
 
     Item {
         anchors.top: item.top
-        anchors.topMargin: 10
-        anchors.leftMargin: 15
-        anchors.rightMargin: 15
+        anchors.topMargin: 10 * scaleRatio
+        anchors.leftMargin: 15 * scaleRatio
+        anchors.rightMargin: 15 * scaleRatio
         anchors.fill: parent
 
-        MoneroComponents.TextPlain {
+        Text {
             id: progressText
             anchors.top: parent.top
             anchors.topMargin: 6
             font.family: MoneroComponents.Style.fontMedium.name
-            font.pixelSize: 13
-            font.bold: MoneroComponents.Style.progressBarProgressTextBold
-            color: MoneroComponents.Style.defaultFontColor
+            font.pixelSize: 13 * scaleRatio
+            font.bold: true
+            color: "white"
             text: qsTr("Synchronizing %1").arg(syncType) + translationManager.emptyString
-            height: 18
+            height: 18 * scaleRatio
         }
 
-        MoneroComponents.TextPlain {
+        Text {
             id: progressTextValue
             anchors.top: parent.top
             anchors.topMargin: 6
             anchors.right: parent.right
             font.family: MoneroComponents.Style.fontMedium.name
-            font.pixelSize: 13
-            font.bold: MoneroComponents.Style.progressBarProgressTextBold
-            color: MoneroComponents.Style.defaultFontColor
-            height:18
+            font.pixelSize: 13 * scaleRatio
+            font.bold: true
+            color: "white"
+            height:18 * scaleRatio
         }
 
+
         Rectangle {
             id: bar
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.top: progressText.bottom
             anchors.topMargin: 4
-            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 }
-            }
+            height: 8 * scaleRatio
+            radius: 8 * scaleRatio
+            color: "#333333" // progressbar bg
 
             Rectangle {
                 id: fillRect
@@ -118,9 +100,10 @@ Rectangle {
                 anchors.bottom: parent.bottom
                 anchors.left: parent.left
                 height: bar.height
-                property int maxWidth: bar.width
+                property int maxWidth: bar.width * scaleRatio
                 width: (maxWidth * fillLevel) / 100
                 radius: 8
+                // could change color based on progressbar status; if(item.fillLevel < 99 )
                 color: "#FA6800"
             }
 
@@ -128,9 +111,12 @@ Rectangle {
                 color:"#333"
                 anchors.bottom: parent.bottom
                 anchors.left: parent.left
-                anchors.leftMargin: 8
+                anchors.leftMargin: 8 * scaleRatio
             }
         }
 
     }
+
+
+
 }

components/QRCodeScanner.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.9
+import QtQuick 2.0
 import QtMultimedia 5.4
 import QtQuick.Dialogs 1.2
 import moneroComponents.QRCodeScanner 1.0

components/RadioButton.qml

@@ -26,23 +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.9
+import QtQuick 2.0
 import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
 
-Item {
+RowLayout {
     id: radioButton
     property alias text: label.text
     property bool checked: false
-    property int fontSize: 14
+    property int fontSize: 14 * scaleRatio
     property alias fontColor: label.color
     signal clicked()
-    height: 26
-    width: layout.width
+    height: 26 * scaleRatio
     // legacy properties
-    property var checkedColor: MoneroComponents.Style.blackTheme ? "white" : "#666666"
-    property var borderColor: checked ? MoneroComponents.Style.inputBorderColorActive : MoneroComponents.Style.inputBorderColorInActive
+    property var checkedColor: "white"
+    property var borderColor: checked ? Qt.rgba(1, 1, 1, 0.35) : Qt.rgba(1, 1, 1, 0.25)
 
     function toggle(){
         radioButton.checked = !radioButton.checked
@@ -50,14 +49,15 @@ Item {
     }
 
     RowLayout {
-        id: layout
-
+        Layout.fillWidth: true
         Rectangle {
             id: button
+            anchors.left: parent.left
+            y: 0
             color: "transparent"
             border.color: borderColor
-            height: radioButton.height
             width: radioButton.height
+            height: radioButton.height
             radius: radioButton.height
 
             Rectangle {
@@ -65,28 +65,37 @@ Item {
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.verticalCenter: parent.verticalCenter
                 color: checkedColor
-                width: 10
-                height: 10
+                width: 10 * scaleRatio
+                height: 10 * scaleRatio
                 radius: 10
                 opacity: 0.8
             }
+
+            MouseArea {
+                anchors.fill: parent
+                cursorShape: Qt.PointingHandCursor
+                onClicked: {
+                    toggle()
+                }
+            }
         }
 
-        MoneroComponents.TextPlain {
+        Text {
             id: label
-            Layout.leftMargin: 10
+            anchors.left: button.right
+            anchors.leftMargin: !isMobile ? 10 : 8
             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,14 +28,13 @@
 
 import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.2
-import QtQuick 2.9
+import QtQuick 2.2
 import QtQuick.Layouts 1.1
 
-import "../js/Utils.js" as Utils
 import "../components" as MoneroComponents
 
 GridLayout {
-    columns: 2
+    columns: (isMobile) ? 1 : 2
     columnSpacing: 32
     id: root
     property alias daemonAddrText: daemonAddr.text
@@ -47,33 +46,21 @@ GridLayout {
     // the wizards get redesigned to the black-theme
     property string placeholderFontFamily: MoneroComponents.Style.fontRegular.name
     property bool placeholderFontBold: false
-    property int placeholderFontSize: 15
+    property int placeholderFontSize: 18 * scaleRatio
     property string placeholderColor: MoneroComponents.Style.defaultFontColor
     property real placeholderOpacity: 0.35
-    property int labelFontSize: 14
 
-    property string lineEditBackgroundColor: "transparent"
-    property string lineEditBorderColor: MoneroComponents.Style.inputBorderColorInActive
-    property string lineEditFontColor: MoneroComponents.Style.defaultFontColor
-    property bool lineEditFontBold: false
-    property int lineEditFontSize: 15
+    property string lineEditBorderColor: Qt.rgba(0, 0, 0, 0.15)
+    property string lineEditBackgroundColor: "white"
+    property string lineEditFontColor: "black"
+    property int lineEditFontSize: 18 * scaleRatio
+    property int labelFontSize: 16 * scaleRatio
+    property bool lineEditFontBold: true
 
     signal editingFinished()
-    signal textChanged()
-
-    function isValid() {
-        return daemonAddr.text.trim().length > 0 && daemonPort.acceptableInput
-    }
 
     function getAddress() {
-        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;
+        return daemonAddr.text.trim() + ":" + daemonPort.text.trim()
     }
 
     LineEdit {
@@ -92,7 +79,6 @@ GridLayout {
         fontBold: lineEditFontBold
         fontSize: lineEditFontSize
         onEditingFinished: root.editingFinished()
-        onTextChanged: root.textChanged()
     }
 
     LineEdit {
@@ -110,9 +96,7 @@ GridLayout {
         fontColor: lineEditFontColor
         fontBold: lineEditFontBold
         fontSize: lineEditFontSize
-        validator: IntValidator{bottom: 1; top: 65535;}
 
         onEditingFinished: root.editingFinished()
-        onTextChanged: root.textChanged()
     }
 }

components/Scroll.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -26,60 +26,59 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.9
-import QtQuick.Layouts 1.2
-import QtQuick.Controls 2.0
+import QtQuick 2.0
 
-import "../js/Wizard.js" as Wizard
-import "../js/Utils.js" as Utils
-import "../components" as MoneroComponents
+Item {
+    id: scrollItem
+    property var flickable
+    width: 15
+    z: 1
 
-ColumnLayout {
-    property alias header: key.text
-    property alias value: val.text
-    Layout.bottomMargin: 10
-    Layout.fillWidth: true
+    function flickableContentYChanged() {
+        if(flickable === undefined)
+            return
 
-    GridLayout {
-        Layout.fillWidth: true
-        columns: 2
-        columnSpacing: 0
+        var t = flickable.height - scroll.height
+        scroll.y = (flickable.contentY / (flickable.contentHeight - flickable.height)) * t
+    }
 
-        Rectangle {
-            Layout.fillWidth: true
-            Layout.preferredHeight: 20
-            color: "transparent"
-
-            MoneroComponents.TextBlock {
-                id: key
-                Layout.fillWidth: true
-                Layout.alignment: Qt.AlignVCenter
-                font.pixelSize: 16
-                text: "test"
-            }
-        }
-
-        Rectangle {
-            Layout.fillWidth: true
-            Layout.preferredHeight: 20
-            color: "transparent"
-
-            MoneroComponents.TextBlock {
-                id: val
-                Layout.fillWidth: true
-                Layout.alignment: Qt.AlignVCenter
-                font.pixelSize: 16
-                text: ""
-            }
-        }
+    MouseArea {
+        id: scrollArea
+        anchors.fill: parent
+        hoverEnabled: true
     }
 
     Rectangle {
-        Layout.preferredHeight: 1
-        Layout.topMargin: 2
-        Layout.bottomMargin: 2
-        Layout.fillWidth: true
-        color: MoneroComponents.Style.dividerColor
-        opacity: MoneroComponents.Style.dividerOpacity
+        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

@@ -0,0 +1,229 @@
+// 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

@@ -1,65 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Layouts 1.1
-
-import "../components" as MoneroComponents
-
-ColumnLayout {
-    property alias buttonText: button.text
-    property alias description: description.text
-    property alias title: title.text
-    signal clicked()
-
-    id: settingsListItem
-    Layout.fillWidth: true
-    spacing: 0
-
-    Rectangle {
-        // divider
-        Layout.preferredHeight: 1
-        Layout.fillWidth: true
-        Layout.bottomMargin: 8
-        color: MoneroComponents.Style.dividerColor
-        opacity: MoneroComponents.Style.dividerOpacity
-    }
-
-    RowLayout {
-        Layout.fillWidth: true
-        spacing: 0
-
-        ColumnLayout {
-            Layout.fillWidth: true
-            Layout.alignment: Qt.AlignVCenter
-            spacing: 0
-
-            MoneroComponents.TextPlain {
-                id: title
-                Layout.fillWidth: true
-                Layout.preferredHeight: 20
-                Layout.topMargin: 8
-                color: MoneroComponents.Style.defaultFontColor
-                opacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.8
-                font.bold: true
-                font.family: MoneroComponents.Style.fontRegular.name
-                font.pixelSize: 16
-            }
-
-            MoneroComponents.TextPlainArea {
-                id: description
-                color: MoneroComponents.Style.dimmedFontColor
-                colorBlackTheme: MoneroComponents.Style._b_dimmedFontColor
-                colorWhiteTheme: MoneroComponents.Style._w_dimmedFontColor
-                Layout.fillWidth: true
-                horizontalAlignment: TextInput.AlignLeft
-            }
-        }
-
-        MoneroComponents.StandardButton {
-            id: button
-            small: true
-            onClicked: {
-                settingsListItem.clicked()
-            }
-            width: 135
-        }
-    }
-}

components/StandardButton.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.9
+import QtQuick 2.0
 import QtQuick.Layouts 1.1
 
 import "../components" as MoneroComponents
@@ -35,119 +35,109 @@ Item {
     id: button
     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 bool small: false
     property alias text: label.text
     property int fontSize: {
-        if(small) return 14;
-        else return 16;
+        if(small) return 14 * scaleRatio;
+        else return 16 * scaleRatio;
     }
-    property alias label: label
     signal clicked()
 
-    height: small ?  30 : 36
-    width: buttonLayout.width + 22
-    implicitHeight: height
-    implicitWidth: width
+    // Dynamic height/width
+    Layout.minimumWidth: {
+        var _padding = 22;
+        if(button.rightIcon !== ""){
+            _padding += 60;
+        }
 
-    function doClick(){
+        var _width = label.contentWidth + _padding;
+        if(_width <= 50) {
+            return 60;
+        }
+
+        return _width;
+    }
+
+    height: small ?  30 * scaleRatio : 36 * scaleRatio
+
+    function doClick() {
+        // Android workaround
         releaseFocus();
         clicked();
     }
 
     Rectangle {
-        id: buttonRect
-        anchors.fill: parent
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: parent.height - 1
         radius: 3
+        color: parent.enabled ? MoneroComponents.Style.buttonBackgroundColor : MoneroComponents.Style.buttonBackgroundColorDisabled
         border.width: parent.focus ? 1 : 0
 
-        state: button.enabled ? "active" : "disabled"
-        Component.onCompleted: state = state
+        MouseArea {
+            anchors.fill: parent
+            cursorShape: Qt.PointingHandCursor
+            hoverEnabled: true
 
-        states: [
-            State {
-                name: "hover"
-                when: buttonArea.containsMouse || button.focus
-                PropertyChanges {
-                    target: buttonRect
-                    color: MoneroComponents.Style.buttonBackgroundColorHover
-                }
-            },
-            State {
-                name: "active"
-                when: button.enabled
-                PropertyChanges {
-                    target: buttonRect
-                    color: MoneroComponents.Style.buttonBackgroundColor
-                }
-            },
-            State {
-                name: "disabled"
-                when: !button.enabled
-                PropertyChanges {
-                    target: buttonRect
-                    color: MoneroComponents.Style.buttonBackgroundColorDisabled
-                }
+            propagateComposedEvents: true
+
+            // 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 }
         }
     }
 
-    RowLayout {
-        id: buttonLayout
-        height: button.height
-        spacing: 11
+    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 {
         anchors.centerIn: parent
+        visible: parent.icon !== ""
+        source: parent.icon
+    }
 
-        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
-            }
-        }
-
-        Image {
-            visible: 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;
+    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;
             }
+            return parent.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.9
+import QtQuick 2.0
 import QtQuick.Controls 2.0
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
@@ -34,7 +34,6 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Window 2.0
 
 import "../components" as MoneroComponents
-import "effects/" as MoneroEffects
 
 Rectangle {
     id: root
@@ -48,7 +47,6 @@ Rectangle {
     property alias textArea: dialogContent
     property alias okText: okButton.text
     property alias cancelText: cancelButton.text
-    property alias closeVisible: closeButton.visible
 
     property var icon
 
@@ -57,18 +55,12 @@ Rectangle {
     signal rejected()
     signal closeCallback();
 
-    // 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)
+    Image {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        source: "../images/middlePanelBg.jpg"
     }
 
     // Make window draggable
@@ -82,8 +74,11 @@ Rectangle {
 
     function open() {
         // Center
-        root.x = parent.width/2 - root.width/2
-        root.y = 100
+        if(!isMobile) {
+            root.x = parent.width/2 - root.width/2
+            root.y = 100
+        }
+        show()
         root.z = 11
         root.visible = true;
     }
@@ -94,66 +89,55 @@ Rectangle {
     }
 
     // TODO: implement without hardcoding sizes
-    width: 520
-    height: 380
+    width: isMobile ? screenWidth : 520
+    height: isMobile ? screenHeight : 380
 
     ColumnLayout {
         id: mainLayout
         spacing: 10
-        anchors.fill: parent
-        anchors.margins: 20
+        anchors { fill: parent; margins: 15 }
 
         RowLayout {
             id: column
-            Layout.topMargin: 14
-            Layout.fillWidth: true
+            //anchors {fill: parent; margins: 16 }
+            Layout.topMargin: 14 * scaleRatio
+            Layout.alignment: Qt.AlignHCenter
 
             MoneroComponents.Label {
                 id: dialogTitle
-                fontSize: 18
+                horizontalAlignment: Text.AlignHCenter
+                fontSize: 18 * scaleRatio
                 fontFamily: "Arial"
                 color: MoneroComponents.Style.defaultFontColor
             }
+
         }
 
-        Item {
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-            Layout.preferredHeight: 240
+        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
 
-            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)
-                        }
+                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)
                     }
                 }
             }
@@ -176,46 +160,17 @@ Rectangle {
 
             MoneroComponents.StandardButton {
                 id: okButton
-                text: qsTr("OK") + translationManager.emptyString
+                text: qsTr("OK")
                 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,12 +26,9 @@
 // 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 QtGraphicalEffects 1.0
+import QtQuick 2.0
 
 import "../components" as MoneroComponents
-import "../components/effects/" as MoneroEffects
 
 Item {
     id: dropdown
@@ -39,14 +36,14 @@ Item {
     property alias dataModel: repeater.model
     property string shadowPressedColor
     property string shadowReleasedColor
-    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 string pressedColor
+    property string releasedColor
+    property string textColor: "#FFFFFF"
+    property alias currentIndex: column.currentIndex
+    property bool expanded: false
     property int dropdownHeight: 42
-    property int fontHeaderSize: 16
-    property int fontItemSize: 14
+    property int fontHeaderSize: 16 * scaleRatio
+    property int fontItemSize: 14 * scaleRatio
     property string colorBorder: MoneroComponents.Style.inputBorderColorInActive
     property string colorHeaderBackground: "transparent"
     property bool headerBorder: true
@@ -57,10 +54,22 @@ 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 = columnid.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(columnid.currentIndex).column1) + translationManager.emptyString : ""
+        firstColText.text = column.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(column.currentIndex).column1) + translationManager.emptyString : ""
     }
 
     Item {
@@ -72,23 +81,23 @@ Item {
         height: dropdown.dropdownHeight
 
         Rectangle {
-            color: "transparent"
+            color: dropdown.colorHeaderBackground
             border.width: dropdown.headerBorder ? 1 : 0
             border.color: dropdown.colorBorder
             radius: 4
             anchors.fill: parent
         }
 
-        MoneroComponents.TextPlain {
+        Text {
             id: firstColText
             anchors.verticalCenter: parent.verticalCenter
             anchors.left: parent.left
-            anchors.leftMargin: 12
+            anchors.leftMargin: 12 * scaleRatio
             elide: Text.ElideRight
             font.family: MoneroComponents.Style.fontRegular.name
             font.bold: dropdown.headerFontBold
             font.pixelSize: dropdown.fontHeaderSize
-            color: dropdown.textColor
+            color: "#FFFFFF"
         }
 
         Item {
@@ -96,126 +105,131 @@ Item {
             anchors.top: parent.top
             anchors.bottom: parent.bottom
             anchors.right: parent.right
-            width: 32
+            width: 32 * scaleRatio
 
             Image {
-                id: dropdownIcon
                 anchors.centerIn: parent
-                source: "qrc:///images/whiteDropIndicator.png"
-                visible: false
-            }
-
-            ColorOverlay {
-                source: dropdownIcon
-                anchors.fill: dropdownIcon
-                color: MoneroComponents.Style.defaultFontColor
-                rotation: dropdown.expanded ? 180  : 0
-                opacity: 1
+                source: "../images/whiteDropIndicator.png"
+                rotation: dropdown.expanded ? 180  * scaleRatio : 0
             }
         }
 
         MouseArea {
             id: dropArea
             anchors.fill: parent
-            onClicked: dropdown.expanded ? popup.close() : popup.open()
+            onClicked: dropdown.expanded = !dropdown.expanded
             hoverEnabled: true
             cursorShape: Qt.PointingHandCursor
         }
     }
 
-    Popup {
-        id: popup
-        padding: 0
-        closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
+    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
 
         Rectangle {
-            id: droplist
-            x: dropdown.x
-            width: dropdown.width
-            y: head.y + head.height
-            clip: true
-            height: dropdown.expanded ? columnid.height : 0
+            anchors.left: parent.left
+            anchors.top: parent.top
+            width: 3 * scaleRatio; height: 3 * scaleRatio
             color: dropdown.pressedColor
+        }
 
-            Behavior on height {
-                NumberAnimation { duration: 100; easing.type: Easing.InQuad }
-            }
+        Rectangle {
+            anchors.right: parent.right
+            anchors.top: parent.top
+            width: 3 * scaleRatio; height: 3 * scaleRatio
+            color: dropdown.pressedColor
+        }
 
-            Column {
-                id: columnid
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.top: parent.top
-                property int currentIndex: 0
+        Behavior on height {
+            NumberAnimation { duration: 100; easing.type: Easing.InQuad }
+        }
 
-                Repeater {
-                    id: repeater
+        Column {
+            id: column
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.top: parent.top
+            property int currentIndex: 0
 
-                    // 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
+            Repeater {
+                id: repeater
 
-                    delegate: Rectangle {
+                // 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
                         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
-                        height: (dropdown.dropdownHeight * 0.75)
-                        //radius: index === repeater.count - 1 ? 4 : 0
-                        color: itemArea.containsMouse || index === columnid.currentIndex || itemArea.containsMouse ? dropdown.releasedColor : dropdown.pressedColor
+                        anchors.rightMargin: 45 * scaleRatio
+                        font.family: MoneroComponents.Style.fontRegular.name
+                        font.pixelSize: 14 * scaleRatio
+                        color: "#FFFFFF"
+                        text: ""
+                    }
 
-                        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.left: parent.left
+                        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: ""
-                        }
+                    Rectangle {
+                        anchors.right: parent.right
+                        anchors.top: parent.top
+                        width: 3 * scaleRatio; height: 3 * scaleRatio
+                        color: parent.color
+                    }
 
-                        Rectangle {
-                            anchors.left: parent.left
-                            anchors.top: parent.top
-                            width: 3; height: 3
-                            color: parent.color
-                        }
+                    MouseArea {
+                        id: itemArea
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        cursorShape: Qt.PointingHandCursor
 
-                        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();
-                                dropdown.update()
-                            }
+                        onClicked: {
+                            dropdown.expanded = false
+                            column.currentIndex = index
+                            changed();
+                            dropdown.update()
                         }
                     }
                 }

components/Style.qml

@@ -3,189 +3,29 @@ pragma Singleton
 import QtQuick 2.5
 
 QtObject {
-    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: 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 defaultFontColor: "white"
+    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 inputBoxBackground: blackTheme ? _b_inputBoxBackground : _w_inputBoxBackground
-    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 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_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_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"
+    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
 }

components/TableDropdown.qml

@@ -0,0 +1,237 @@
+// 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

@@ -0,0 +1,202 @@
+// 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.9
+import QtQuick 2.0
 
 import "../components" as MoneroComponents
 
 TextEdit {
     color: MoneroComponents.Style.defaultFontColor
     font.family: MoneroComponents.Style.fontRegular.name
-    selectionColor: MoneroComponents.Style.textSelectionColor
+    selectionColor: MoneroComponents.Style.dimmedFontColor
     wrapMode: Text.Wrap
     readOnly: true
     selectByMouse: true

components/TextPlain.qml

@@ -1,28 +0,0 @@
-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

@@ -1,48 +0,0 @@
-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/TickDelegate.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2019, The Monero Project
+// Copyright (c) 2014-2018, The Monero Project
 // 
 // All rights reserved.
 // 
@@ -26,26 +26,47 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import QtQuick 2.9
-import QtQuick.Layouts 1.2
-import QtQuick.Controls 2.0
+import QtQuick 2.0
 
 import "../components" as MoneroComponents
 
-Rectangle {
-    property bool active: false
-    Layout.preferredWidth: 30
-    Layout.fillHeight: true
-    property string activeColor: MoneroComponents.Style.defaultFontColor
-    property string inactiveColor: MoneroComponents.Style.progressBarBackgroundColor
-    color: "transparent"
+Item {
+    id: delegateItem
+    width: 1
+    height: 48
+    property bool mainTick: false
+    property int currentIndex
+    property int currentX
+
+    Image {
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.top: parent.top
+        visible: parent.mainTick
+        source: "../images/privacyTick.png"
+
+        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 ""
+            }
+        }
+    }
 
     Rectangle {
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
-        width: 10
-        height: 10
-        radius: 10
-        color: parent.active ? parent.activeColor : parent.inactiveColor
+        anchors.top: parent.top
+        anchors.topMargin: 14
+        width: 1
+        color: "#DBDBDB"
+        height:  8
+        visible: !parent.mainTick
     }
 }

components/TipItem.qml

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

components/TitleBar.qml

@@ -26,337 +26,219 @@
 // 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 2.5
 import QtQuick.Window 2.0
-import QtGraphicalEffects 1.0
-import QtQuick.Layouts 1.2
-
-import FontAwesome 1.0
-import "." as MoneroComponents
-import "effects/" as MoneroEffects
+import QtQuick.Layouts 1.1
 
 Rectangle {
-    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: ""
+    id: titleBar
 
     height: {
-        if(!persistentSettings.customDecorations) return 0;
-        return 50;
-    }
+        if(!customDecorations || isMobile){
+            return 0;
+        }
 
+        if(small) return 38 * scaleRatio;
+        else return 50 * scaleRatio;
+    }
+    y: -height
     z: 1
-    color: "transparent"
+
+    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
 
     signal closeClicked
     signal maximizeClicked
     signal minimizeClicked
-    signal languageClicked
-    signal closeWalletClicked
+    signal goToBasicVersion(bool yes)
 
-    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}
+    Item {
+        // Background gradient
+        width: parent.width
+        height: parent.height
+        z: parent.z + 1
+
+        Image {
+           anchors.fill: parent
+           height: titleBar.height
+           width: titleBar.width
+           source: "../images/titlebarGradient.jpg"
         }
-    ]
-
-    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)
     }
 
-    RowLayout {
+    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
         z: parent.z + 2
-        spacing: 0
-        anchors.fill: parent
 
-        // collapse sidebar
         Rectangle {
-            id: btnCloseWallet
+            id: minimizeButton
+            visible: showMinimizeButton
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            width: 42
             color: "transparent"
-            Layout.preferredWidth: parent.height
-            Layout.preferredHeight: parent.height
-
-
-            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 {
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
-                onExited: parent.color = "transparent"
-                onClicked: root.closeWalletClicked(leftPanel.visible)
-            }
-        }
-
-        // language selection
-        Rectangle {
-            id: btnLanguageToggle
-            color: "transparent"
-            Layout.preferredWidth: parent.height
-            Layout.preferredHeight: parent.height
-
-            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 {
-                anchors.fill: parent
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
-                onExited: parent.color = "transparent"
-                onClicked: root.languageClicked()
-            }
-        }
-
-        // switch theme
-        Rectangle {
-            color: "transparent"
-            Layout.preferredWidth: parent.height
-            Layout.preferredHeight: parent.height
-
-            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
-                hoverEnabled: true
-                cursorShape: Qt.PointingHandCursor
-                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
+                anchors.centerIn: parent
+                source: "../images/minimize.png"
             }
 
             MouseArea {
+                id: minimizeArea
                 anchors.fill: parent
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
-                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
-                onExited: parent.color = "transparent"
-                onClicked: root.minimizeClicked();
+                onEntered: minimizeButton.color = "#262626";
+                onExited: minimizeButton.color = "transparent";
+                onClicked: minimizeClicked();
             }
         }
 
-        // maximize
         Rectangle {
-            id: test
-            visible: root.showMaximizeButton
-            color: "transparent"
-            Layout.preferredWidth: parent.height
-            Layout.preferredHeight: parent.height
+            id: maximizeButton
+            visible: showMaximizeButton
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            width: 42
+            color: "transparent";
 
             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
+                anchors.centerIn: parent
                 height: 16
                 width: 16
-                image: MoneroComponents.Style.titleBarCloseSource
-                color: MoneroComponents.Style.defaultFontColor
-                fontAwesomeFallbackIcon: FontAwesome.timesRectangle
-                fontAwesomeFallbackSize: 18
-                fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 0.8 : 0.6
-                opacity: 0.75
+                source: appWindow.visibility === Window.FullScreen ?  "../images/backToWindowIcon.png" :
+                                                                      "../images/fullscreen.png"
+            }
+
+            MouseArea {
+                id: maximizeArea
+                anchors.fill: parent
+                hoverEnabled: true
+                cursorShape: Qt.PointingHandCursor
+                onEntered: maximizeButton.color = "#262626";
+                onExited: maximizeButton.color = "transparent";
+                onClicked: maximizeClicked();
+            }
+        }
+
+        Rectangle {
+            id: closeButton
+            visible: showCloseButton
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            width: 42
+            color: containsMouse ? "#E04343" : "#00000000"
+
+            Image {
+                anchors.centerIn: parent
+                width: 16
+                height: 16
+                source: "../images/close.png"
             }
 
             MouseArea {
                 anchors.fill: parent
+                onClicked: closeClicked();
                 hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
-                onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
-                onExited: parent.color = "transparent"
-                onClicked: root.closeClicked();
+                onEntered: closeButton.color = "#262626";
+                onExited: closeButton.color = "transparent";
             }
         }
     }
 
+    // window borders
+    Rectangle {
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        height: 1
+        color: "#2F2F2F"
+        z: parent.z + 1
+    }
+
     Rectangle {
-        z: parent.z + 3
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
+        anchors.top: parent.top
         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
-        }
-    }
-
-    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
-            }
-        }
+        anchors.left: parent.left
+        visible: titleBar.small
+        height: 1
+        color: "#2F2F2F"
+        z: parent.z + 1
     }
 }

components/WarningBox.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.9
+import QtQuick 2.7
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0
 
@@ -7,19 +7,18 @@ import "." as MoneroComponents
 Rectangle {
     id: root
     property alias text: content.text
-    property alias textColor: content.color
-    property int fontSize: 15
+    property int fontSize: 15 * scaleRatio
 
     Layout.fillWidth: true
     Layout.preferredHeight: warningLayout.height
 
-    color: MoneroComponents.Style.titleBarButtonHoverColor
+    color: "#09FFFFFF"
     radius: 4
     border.color: MoneroComponents.Style.inputBorderColorInActive
     border.width: 1
-
+    
     signal linkActivated;
-
+    
     RowLayout {
         id: warningLayout
         spacing: 0
@@ -30,32 +29,34 @@ Rectangle {
             Layout.alignment: Qt.AlignVCenter
             Layout.preferredHeight: 33
             Layout.preferredWidth: 33
-            Layout.rightMargin: 12
-            Layout.leftMargin: 18
+            Layout.rightMargin: 14
+            Layout.leftMargin: 14
             Layout.topMargin: 12
             Layout.bottomMargin: 12
-            source: "qrc:///images/warning.png"
+            source: "../images/warning.png"
         }
 
-        Text {
+        TextArea {
             id: content
             Layout.fillWidth: true
             color: MoneroComponents.Style.defaultFontColor
             font.family: MoneroComponents.Style.fontRegular.name
             font.pixelSize: root.fontSize
             horizontalAlignment: TextInput.AlignLeft
+            selectByMouse: false
             textFormat: Text.RichText
             wrapMode: Text.WordWrap
-            leftPadding: 4
-            rightPadding: 18
-            topPadding: 10
-            bottomPadding: 10
+            textMargin: 0
+            leftPadding: 0
+            topPadding: 6
+            readOnly: true
             onLinkActivated: root.linkActivated();
 
+            // @TODO: Legacy. Remove after Qt 5.8.
+            // https://stackoverflow.com/questions/41990013
             MouseArea {
                 anchors.fill: parent
-                acceptedButtons: Qt.NoButton
-                cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+                enabled: false
             }
         }
     }

components/effects/GradientBackground.qml

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

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

filter.cpp

@@ -27,14 +27,9 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "filter.h"
-#include <QtGlobal>
 #include <QKeyEvent>
 #include <QDebug>
 
-#ifdef QT_DEBUG
-    #include "private/qabstractanimation_p.h"
-#endif
-
 filter::filter(QObject *parent) :
     QObject(parent)
 {
@@ -43,17 +38,6 @@ filter::filter(QObject *parent) :
 }
 
 bool filter::eventFilter(QObject *obj, QEvent *ev) {
-    // macOS sends fileopen signal for incoming uri handlers
-    if (ev->type() == QEvent::FileOpen) {
-        QFileOpenEvent *openEvent = static_cast<QFileOpenEvent *>(ev);
-        QUrl scheme = openEvent->url();
-        emit uriHandler(scheme);
-    }
-
-    if(ev->type() == QEvent::KeyPress || ev->type() == QEvent::MouseButtonRelease){
-        emit userActivity();
-    }
-
     switch(ev->type()) {
     case QEvent::KeyPress: {
         QKeyEvent *ke = static_cast<QKeyEvent*>(ev);
@@ -91,21 +75,6 @@ bool filter::eventFilter(QObject *obj, QEvent *ev) {
     case QEvent::KeyRelease: {
         QKeyEvent *ke = static_cast<QKeyEvent*>(ev);
 
-#ifdef QT_DEBUG
-        if(ke->key() == Qt::Key_F9){
-            QUnifiedTimer::instance()->setSlowModeEnabled(true);
-            QUnifiedTimer::instance()->setSlowdownFactor(10);
-            qDebug() << "Slow animations enabled";
-        }
-
-        if(ke->key() == Qt::Key_F10){
-            QUnifiedTimer::instance()->setSlowModeEnabled(false);
-            QUnifiedTimer::instance()->setSlowdownFactor(1);
-
-            qDebug() << "Slow animations disabled";
-        }
-#endif
-
         if(ke->key() == Qt::Key_Backtab)
             m_backtabPressed = false;
 

filter.h

@@ -1,21 +1,21 @@
-// Copyright (c) 2014-2019, The Monero Project
-//
+// 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
@@ -48,8 +48,6 @@ signals:
     void sequenceReleased(const QVariant &o, const QVariant &seq);
     void mousePressed(const QVariant &o, const QVariant &x, const QVariant &y);
     void mouseReleased(const QVariant &o, const QVariant &x, const QVariant &y);
-    void userActivity();
-    void uriHandler(const QUrl &url);
 };
 
 #endif // FILTER_H