From fd3035cd568a2a8d3017845d9eed7fc0daeaa2e7 Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Mon, 20 Dec 2021 13:20:48 +0300 Subject: [PATCH] Create CMakeLists.txt for Qt project --- .gitmodules | 3 + CMakeLists.txt | 235 +++++++ src/CMakeLists.txt | 3 - src/additional/cmake/BrewHelper.cmake | 21 - src/additional/cmake/ExternalLibraryHelper.cmake | 58 -- src/additional/cmake/FindQREncode.cmake | 58 -- src/additional/libqrencode | 1 + src/alert.cpp | 2 +- src/bitcoinrpc.cpp | 2 +- src/db.cpp | 2 +- src/init.cpp | 2 +- src/interface.h | 112 +++ src/main.cpp | 2 +- src/net.cpp | 2 +- src/noui.cpp | 2 +- src/ntp.cpp | 2 +- src/qt/aboutdialog.ui | 158 +++++ src/qt/addressbookpage.ui | 164 +++++ src/qt/askpassphrasedialog.ui | 151 ++++ src/qt/bitcoin.cpp | 2 +- src/qt/bitcoin.qrc | 98 ++-- src/qt/bitcoingui.cpp | 2 +- src/qt/clientmodel.cpp | 2 +- src/qt/coincontroldialog.ui | 554 +++++++++++++++ src/qt/editaddressdialog.ui | 105 +++ src/qt/forms/aboutdialog.ui | 158 ----- src/qt/forms/addressbookpage.ui | 164 ----- src/qt/forms/askpassphrasedialog.ui | 151 ---- src/qt/forms/coincontroldialog.ui | 554 --------------- src/qt/forms/editaddressdialog.ui | 105 --- src/qt/forms/intro.ui | 266 -------- src/qt/forms/multisigaddressentry.ui | 170 ----- src/qt/forms/multisigdialog.ui | 793 --------------------- src/qt/forms/multisiginputentry.ui | 160 ----- src/qt/forms/optionsdialog.ui | 613 ----------------- src/qt/forms/overviewpage.ui | 434 ------------ src/qt/forms/qrcodedialog.ui | 212 ------ src/qt/forms/rpcconsole.ui | 786 --------------------- src/qt/forms/secondauthdialog.ui | 230 ------- src/qt/forms/sendcoinsdialog.ui | 794 ---------------------- src/qt/forms/sendcoinsentry.ui | 169 ----- src/qt/forms/signverifymessagedialog.ui | 386 ----------- src/qt/forms/transactiondescdialog.ui | 74 -- src/qt/intro.ui | 266 ++++++++ src/qt/locale/bitcoin_en.ts | 1 - src/qt/locale/bitcoin_ru.ts | 1 - src/qt/locale/bitcoin_uk.ts | 1 - src/qt/locale/translations.pro | 17 - src/qt/multisigaddressentry.ui | 170 +++++ src/qt/multisigdialog.ui | 793 +++++++++++++++++++++ src/qt/multisiginputentry.ui | 160 +++++ src/qt/optionsdialog.ui | 613 +++++++++++++++++ src/qt/overviewpage.ui | 434 ++++++++++++ src/qt/qrcodedialog.ui | 212 ++++++ src/qt/qtipcserver.cpp | 2 +- src/qt/res/bitcoin-qt.rc | 4 +- src/qt/rpcconsole.ui | 786 +++++++++++++++++++++ src/qt/secondauthdialog.ui | 230 +++++++ src/qt/sendcoinsdialog.ui | 794 ++++++++++++++++++++++ src/qt/sendcoinsentry.ui | 169 +++++ src/qt/signverifymessagedialog.ui | 386 +++++++++++ src/qt/test/test_main.cpp | 16 - src/qt/test/uritests.cpp | 71 -- src/qt/test/uritests.h | 15 - src/qt/transactiondesc.cpp | 2 +- src/qt/transactiondescdialog.ui | 74 ++ src/qt/transactiontablemodel.cpp | 2 +- src/qt/walletmodel.cpp | 2 +- src/rpcdump.cpp | 2 +- src/ui_interface.h | 112 --- src/util.cpp | 2 +- src/wallet.cpp | 2 +- src/wallet.h | 2 +- 73 files changed, 6640 insertions(+), 6663 deletions(-) create mode 100644 CMakeLists.txt delete mode 100644 src/additional/cmake/BrewHelper.cmake delete mode 100644 src/additional/cmake/ExternalLibraryHelper.cmake delete mode 100644 src/additional/cmake/FindQREncode.cmake create mode 160000 src/additional/libqrencode create mode 100644 src/interface.h create mode 100644 src/qt/aboutdialog.ui create mode 100644 src/qt/addressbookpage.ui create mode 100644 src/qt/askpassphrasedialog.ui create mode 100644 src/qt/coincontroldialog.ui create mode 100644 src/qt/editaddressdialog.ui delete mode 100644 src/qt/forms/aboutdialog.ui delete mode 100644 src/qt/forms/addressbookpage.ui delete mode 100644 src/qt/forms/askpassphrasedialog.ui delete mode 100644 src/qt/forms/coincontroldialog.ui delete mode 100644 src/qt/forms/editaddressdialog.ui delete mode 100644 src/qt/forms/intro.ui delete mode 100644 src/qt/forms/multisigaddressentry.ui delete mode 100644 src/qt/forms/multisigdialog.ui delete mode 100644 src/qt/forms/multisiginputentry.ui delete mode 100644 src/qt/forms/optionsdialog.ui delete mode 100644 src/qt/forms/overviewpage.ui delete mode 100644 src/qt/forms/qrcodedialog.ui delete mode 100644 src/qt/forms/rpcconsole.ui delete mode 100644 src/qt/forms/secondauthdialog.ui delete mode 100644 src/qt/forms/sendcoinsdialog.ui delete mode 100644 src/qt/forms/sendcoinsentry.ui delete mode 100644 src/qt/forms/signverifymessagedialog.ui delete mode 100644 src/qt/forms/transactiondescdialog.ui create mode 100644 src/qt/intro.ui delete mode 100644 src/qt/locale/translations.pro create mode 100644 src/qt/multisigaddressentry.ui create mode 100644 src/qt/multisigdialog.ui create mode 100644 src/qt/multisiginputentry.ui create mode 100644 src/qt/optionsdialog.ui create mode 100644 src/qt/overviewpage.ui create mode 100644 src/qt/qrcodedialog.ui create mode 100644 src/qt/rpcconsole.ui create mode 100644 src/qt/secondauthdialog.ui create mode 100644 src/qt/sendcoinsdialog.ui create mode 100644 src/qt/sendcoinsentry.ui create mode 100644 src/qt/signverifymessagedialog.ui delete mode 100644 src/qt/test/test_main.cpp delete mode 100644 src/qt/test/uritests.cpp delete mode 100644 src/qt/test/uritests.h create mode 100644 src/qt/transactiondescdialog.ui delete mode 100644 src/ui_interface.h diff --git a/.gitmodules b/.gitmodules index a43a6ab..6452f7c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "src/additional/leveldb"] path = src/additional/leveldb url = https://github.com/google/leveldb +[submodule "src/additional/libqrencode"] + path = src/additional/libqrencode + url = https://github.com/fukuchi/libqrencode diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..f8e2a48 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,235 @@ +cmake_minimum_required(VERSION 3.4.1) + +## +## mkdir build && cd build +## +## cmake -DBerkeleyDB_ROOT:STRING=/opt/homebrew/Cellar/berkeley-db@4/4.8.30 .. +## cmake -DUSE_ASM=1 .. +## cmake -DUSE_SSE2 .. +## cmake -DBerkeleyDB_INC:STRING=/usr/include -DBerkeleyDB_LIBS:STRING=/usr/lib/aarch64-linux-gnu -DUSE_SSE2 -DUSE_LEVELDB .. +## + +project(novacoin-qt VERSION 0.5.9 LANGUAGES C CXX OBJCXX ASM) + +find_program(CCACHE_FOUND ccache) +if(CCACHE_FOUND) + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) + set(CMAKE_C_COMPILER_LAUNCHER ccache) + set(CMAKE_CXX_COMPILER_LAUNCHER ccache) +endif(CCACHE_FOUND) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +find_package(Qt6 COMPONENTS LinguistTools Core Widgets Gui Network Qml REQUIRED) + +set (CMAKE_C_FLAGS "-flto -O3 -fPIC -Wno-deprecated -fstack-protector-all -Wstack-protector -D_FORTIFY_SOURCE=2") +set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fexceptions -frtti") + +set(Boost_USE_STATIC_LIBS ON) +find_package(Boost REQUIRED COMPONENTS atomic chrono filesystem program_options system thread) +set(OPENSSL_USE_STATIC_LIBS ON) +find_package(OpenSSL REQUIRED) + +add_subdirectory(src/additional/libqrencode) +add_subdirectory(src/additional/IXWebSocket) + +# Set default root path for berkeley db +if (NOT BerkeleyDB_ROOT) +set(BerkeleyDB_ROOT /usr) +endif() + +# Set default include path for berkeley db +if (NOT BerkeleyDB_INC) +set(BerkeleyDB_INC ${BerkeleyDB_ROOT}/include) +endif() + +if (NOT EXISTS ${BerkeleyDB_INC}/db_cxx.h) + message(FATAL_ERROR "Unable to find db_cxx.h header file in ${BerkeleyDB_INC} directory. Try to specify either include directory path via BerkeleyDB_INC or berkeley db root path via BerkeleyDB_ROOT variable.") +endif() + +# Set default library path for berkeley db +if (NOT BerkeleyDB_LIBS) +set(BerkeleyDB_LIBS ${BerkeleyDB_ROOT}/lib) +endif() + +set(generic_sources + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/bitcoin.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/bitcoingui.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/intro.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/transactiontablemodel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/addresstablemodel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/optionsdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/sendcoinsdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/coincontroldialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/coincontroltreewidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/addressbookpage.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/signverifymessagedialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/aboutdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/editaddressdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/bitcoinaddressvalidator.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/trafficgraphwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/mintingfilterproxy.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/mintingtablemodel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/mintingview.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/kernelrecord.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/alert.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/version.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/sync.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/util.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/netbase.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/ntp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/key.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/script.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/miner.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/init.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/net.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/stun.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/irc.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/checkpoints.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/addrman.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/db.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/walletdb.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/clientmodel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/guiutil.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/transactionrecord.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/optionsmodel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/monitoreddatamapper.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/transactiondesc.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/transactiondescdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/bitcoinstrings.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/bitcoinamountfield.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/wallet.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/keystore.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/transactionfilterproxy.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/transactionview.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/walletmodel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/bitcoinrpc.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/rpcdump.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/rpcnet.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/rpcmining.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/rpcwallet.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/rpcblockchain.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/rpcrawtransaction.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/overviewpage.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/csvmodelwriter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/crypter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/sendcoinsentry.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/qvalidatedlineedit.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/bitcoinunits.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/qvaluecombobox.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/askpassphrasedialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/protocol.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/notificator.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/qtipcserver.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/rpcconsole.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/noui.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel_worker.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/multisigaddressentry.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/multisiginputentry.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/multisigdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/secondauthdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/qrcodedialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/base58.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/ipcollector.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/intro.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/coincontroldialog.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/sendcoinsdialog.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/addressbookpage.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/signverifymessagedialog.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/aboutdialog.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/editaddressdialog.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/transactiondescdialog.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/overviewpage.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/sendcoinsentry.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/askpassphrasedialog.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/rpcconsole.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/optionsdialog.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/multisigaddressentry.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/multisiginputentry.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/multisigdialog.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/secondauthdialog.ui + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/qrcodedialog.ui +) + +qt6_create_translation(bitcoin_en_qm ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/locale/bitcoin_en.ts) +qt6_create_translation(bitcoin_ru_qm ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/locale/bitcoin_ru.ts) +qt6_create_translation(bitcoin_uk_qm ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/locale/bitcoin_uk.ts) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/qt/bitcoin.qrc bitcoin.qrc) + +list(APPEND ALL_SOURCES ${generic_sources} bitcoin.qrc) +list(APPEND ALL_LIBRARIES ${Boost_LIBRARIES} ixwebsocket OpenSSL::Crypto qrencode Qt6::Gui Qt6::Widgets Qt6::Core Qt6::Network) + +if (WIN32) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/bitcoin-qt.rc bitcoin-qt.rc) + list(APPEND ALL_SOURCES bitcoin-qt.rc) +endif() + +if (APPLE) + list(APPEND ALL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/bitcoin.icns ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/macdockiconhandler.mm ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/macnotificationhandler.mm) + list(APPEND ALL_LIBRARIES "-framework Foundation -framework ApplicationServices -framework AppKit") +endif() + +# Try various libdb library file extensions +if (EXISTS ${BerkeleyDB_LIBS}/libdb_cxx.a) + list(APPEND ALL_LIBRARIES ${BerkeleyDB_LIBS}/libdb_cxx.a) +elseif(EXISTS ${BerkeleyDB_LIBS}/libdb_cxx.so) + list(APPEND ALL_LIBRARIES ${BerkeleyDB_LIBS}/libdb_cxx.so) +elseif(EXISTS ${BerkeleyDB_LIBS}/libdb_cxx.dylib) + list(APPEND ALL_LIBRARIES ${BerkeleyDB_LIBS}/libdb_cxx.dylib) +elseif(EXISTS ${BerkeleyDB_LIBS}/libdb_cxx.dll) + list(APPEND ALL_LIBRARIES ${BerkeleyDB_LIBS}/libdb_cxx.dll) +else() + message(FATAL_ERROR "Unable to find libdb_cxx library in ${BerkeleyDB_LIBS} directory. Try to specify either library path via BerkeleyDB_LIBS or berkeley db root path via BerkeleyDB_ROOT variable.") +endif() + +if(USE_LEVELDB) + # Disable useless targets + option(LEVELDB_BUILD_TESTS "Build LevelDB's unit tests" OFF) + option(LEVELDB_BUILD_BENCHMARKS "Build LevelDB's benchmarks" OFF) + option(LEVELDB_INSTALL "Install LevelDB's header and library" OFF) + + add_subdirectory(src/additional/leveldb) + list(APPEND ALL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/txdb-leveldb.cpp) + list(APPEND ALL_LIBRARIES leveldb) + list(APPEND ALL_DEFINITIONS USE_LEVELDB) +else() + list(APPEND ALL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/txdb-bdb.cpp) +endif() + +if (USE_ASM) + # Assembler implementation + set(asm_sources + ${CMAKE_CURRENT_SOURCE_DIR}/src/crypto/scrypt/asm/scrypt-arm.S + ${CMAKE_CURRENT_SOURCE_DIR}/src/crypto/scrypt/asm/scrypt-x86.S + ${CMAKE_CURRENT_SOURCE_DIR}/src/crypto/scrypt/asm/scrypt-x86_64.S + ) + + list(APPEND ALL_SOURCES ${generic_sources} ${asm_sources}) + list(APPEND ALL_DEFINITIONS USE_ASM) +elseif (USE_SSE2) + list( APPEND ALL_SOURCES ${generic_sources} ${CMAKE_CURRENT_SOURCE_DIR}/src/crypto/scrypt/intrin/scrypt-sse2.cpp ) + list(APPEND ALL_DEFINITIONS USE_SSE2) +else() + list( APPEND ALL_SOURCES ${generic_sources} ${CMAKE_CURRENT_SOURCE_DIR}/src/crypto/scrypt/generic/scrypt-generic.cpp ) +endif() + +# Generate build info header +execute_process ( + COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/share/genbuild.sh ${CMAKE_CURRENT_SOURCE_DIR}/src/build.h" + OUTPUT_VARIABLE outVar +) +list(APPEND ALL_DEFINITIONS HAVE_BUILD_INFO) + +add_executable(novacoin-qt ${ALL_SOURCES}) +target_include_directories(novacoin-qt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/json ${BerkeleyDB_INC} ${CMAKE_CURRENT_SOURCE_DIR}/src/additional/leveldb/helpers ${Boost_INCLUDE_DIRS}) +target_link_libraries(novacoin-qt ${ALL_LIBRARIES}) + +set_property(TARGET novacoin-qt PROPERTY CXX_STANDARD 17) +set_property(TARGET novacoin-qt PROPERTY CXX_STANDARD_REQUIRED TRUE) +set_property(TARGET novacoin-qt PROPERTY COMPILE_DEFINITIONS ${ALL_DEFINITIONS} USE_QRCODE) +set_property(TARGET novacoin-qt PROPERTY CMAKE_WARN_DEPRECATED FALSE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 07773fd..27ecde0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,9 +21,6 @@ endif(CCACHE_FOUND) set (CMAKE_C_FLAGS "-flto -O3 -fPIC -Wno-deprecated -fstack-protector-all -Wstack-protector -D_FORTIFY_SOURCE=2") set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fexceptions -frtti") -# Add path for custom modules -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/additional/cmake) - set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS atomic chrono filesystem program_options system thread) set(OPENSSL_USE_STATIC_LIBS ON) diff --git a/src/additional/cmake/BrewHelper.cmake b/src/additional/cmake/BrewHelper.cmake deleted file mode 100644 index 6bf45d2..0000000 --- a/src/additional/cmake/BrewHelper.cmake +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2018 The Bitcoin developers - -find_program(BREW brew) - -function(find_brew_prefix VAR NAME) - if(NOT BREW) - return() - endif() - - if(DEFINED ${VAR}) - return() - endif() - - execute_process( - COMMAND ${BREW} --prefix ${NAME} - OUTPUT_VARIABLE PREFIX - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - set(${VAR} ${PREFIX} PARENT_SCOPE) -endfunction() diff --git a/src/additional/cmake/ExternalLibraryHelper.cmake b/src/additional/cmake/ExternalLibraryHelper.cmake deleted file mode 100644 index b4251a0..0000000 --- a/src/additional/cmake/ExternalLibraryHelper.cmake +++ /dev/null @@ -1,58 +0,0 @@ -include(FindPackageMessage) - -# Find a library component, set the variables and create an imported target. -# Variable names are compliant with cmake standards. -function(find_component LIB COMPONENT) - cmake_parse_arguments(ARG - "" - "" - "HINTS;INCLUDE_DIRS;INTERFACE_LINK_LIBRARIES;NAMES;PATHS;PATH_SUFFIXES" - ${ARGN} - ) - - # If the component is not requested, skip the search. - if(${LIB}_FIND_COMPONENTS AND NOT ${COMPONENT} IN_LIST ${LIB}_FIND_COMPONENTS) - return() - endif() - - find_library(${LIB}_${COMPONENT}_LIBRARY - NAMES ${ARG_NAMES} - PATHS "" ${ARG_PATHS} - HINTS "" ${ARG_HINTS} - PATH_SUFFIXES "lib" ${ARG_PATH_SUFFIXES} - ) - mark_as_advanced(${LIB}_${COMPONENT}_LIBRARY) - - if(${LIB}_${COMPONENT}_LIBRARY) - # On success, set the standard FOUND variable... - set(${LIB}_${COMPONENT}_FOUND TRUE PARENT_SCOPE) - - # ... and append the library path to the LIBRARIES variable ... - list(APPEND ${LIB}_LIBRARIES - "${${LIB}_${COMPONENT}_LIBRARY}" - ${ARG_INTERFACE_LINK_LIBRARIES} - ) - list(REMOVE_DUPLICATES ${LIB}_LIBRARIES) - set(${LIB}_LIBRARIES ${${LIB}_LIBRARIES} PARENT_SCOPE) - - # ... and create an imported target for the component, if not already - # done. - if(NOT TARGET ${LIB}::${COMPONENT}) - add_library(${LIB}::${COMPONENT} UNKNOWN IMPORTED) - set_target_properties(${LIB}::${COMPONENT} PROPERTIES - IMPORTED_LOCATION "${${LIB}_${COMPONENT}_LIBRARY}" - ) - set_property(TARGET ${LIB}::${COMPONENT} PROPERTY - INTERFACE_INCLUDE_DIRECTORIES ${ARG_INCLUDE_DIRS} - ) - set_property(TARGET ${LIB}::${COMPONENT} PROPERTY - INTERFACE_LINK_LIBRARIES ${ARG_INTERFACE_LINK_LIBRARIES} - ) - endif() - - find_package_message("${LIB}_${COMPONENT}" - "Found ${LIB} component ${COMPONENT}: ${${LIB}_${COMPONENT}_LIBRARY}" - "[${${LIB}_${COMPONENT}_LIBRARY}][${ARG_INCLUDE_DIRS}]" - ) - endif() -endfunction() diff --git a/src/additional/cmake/FindQREncode.cmake b/src/additional/cmake/FindQREncode.cmake deleted file mode 100644 index 3794197..0000000 --- a/src/additional/cmake/FindQREncode.cmake +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (c) 2019-2020 The Bitcoin developers -# Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#.rst -# FindQREncode -# ------------- -# -# Find the QREncode library. The following -# components are available:: -# qrencode -# -# This will define the following variables:: -# -# QREncode_FOUND - system has QREncode lib -# QREncode_INCLUDE_DIRS - the QREncode include directories -# QREncode_LIBRARIES - Libraries needed to use QREncode -# -# And the following imported target:: -# -# QREncode::qrencode - -include(BrewHelper) -find_brew_prefix(_QREncode_BREW_HINT qrencode) - -find_package(PkgConfig) -pkg_check_modules(PC_QREncode QUIET libqrencode) - -find_path(QREncode_INCLUDE_DIR - NAMES qrencode.h - HINTS ${_QREncode_BREW_HINT} - PATHS ${PC_QREncode_INCLUDE_DIRS} - PATH_SUFFIXES include -) - -set(QREncode_INCLUDE_DIRS "${QREncode_INCLUDE_DIR}") -mark_as_advanced(QREncode_INCLUDE_DIR) - -# TODO: extract a version number. -# For now qrencode does not provide an easy way to extract a version number. - -if(QREncode_INCLUDE_DIR) - include(ExternalLibraryHelper) - find_component(QREncode qrencode - NAMES qrencode - HINTS ${_QREncode_BREW_HINT} - PATHS ${PC_QREncode_LIBRARY_DIRS} - INCLUDE_DIRS ${QREncode_INCLUDE_DIRS} - ) -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(QREncode - REQUIRED_VARS - QREncode_INCLUDE_DIR - REASON_FAILURE_MESSAGE "if displaying QR codes is not required, it can be skipped by passing -DENABLE_QRCODE=OFF to the cmake command line" - HANDLE_COMPONENTS -) diff --git a/src/additional/libqrencode b/src/additional/libqrencode new file mode 160000 index 0000000..715e29f --- /dev/null +++ b/src/additional/libqrencode @@ -0,0 +1 @@ +Subproject commit 715e29fd4cd71b6e452ae0f4e36d917b43122ce8 diff --git a/src/alert.cpp b/src/alert.cpp index ea2bc57..2518667 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -9,7 +9,7 @@ #include "key.h" #include "net.h" #include "sync.h" -#include "ui_interface.h" +#include "interface.h" using namespace std; diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 8f2b94c..3f52156 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -6,7 +6,7 @@ #include "init.h" #include "util.h" #include "sync.h" -#include "ui_interface.h" +#include "interface.h" #include "base58.h" #include "bitcoinrpc.h" #include "db.h" diff --git a/src/db.cpp b/src/db.cpp index 8091216..7ee93cf 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -7,7 +7,7 @@ #include "net.h" #include "util.h" #include "main.h" -#include "ui_interface.h" +#include "interface.h" #include #include diff --git a/src/init.cpp b/src/init.cpp index 6c454fe..a16f7fb 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -9,7 +9,7 @@ #include "init.h" #include "util.h" #include "ipcollector.h" -#include "ui_interface.h" +#include "interface.h" #include "checkpoints.h" #include #include diff --git a/src/interface.h b/src/interface.h new file mode 100644 index 0000000..d62e64b --- /dev/null +++ b/src/interface.h @@ -0,0 +1,112 @@ +// Copyright (c) 2010 Satoshi Nakamoto +// Copyright (c) 2012 The Bitcoin developers +// Distributed under the MIT/X11 software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. +#ifndef BITCOIN_UI_INTERFACE_H +#define BITCOIN_UI_INTERFACE_H + +#include +#include +#include + +#include "util.h" + +class CBasicKeyStore; +class CWallet; +class uint256; + +/** General change type (added, updated, removed). */ +enum ChangeType +{ + CT_NEW, + CT_UPDATED, + CT_DELETED +}; + +/** Signals for UI communication. */ +class CClientUIInterface +{ +public: + /** Flags for CClientUIInterface::ThreadSafeMessageBox */ + enum MessageBoxFlags + { + YES = 0x00000002, + OK = 0x00000004, + NO = 0x00000008, + YES_NO = (YES|NO), + CANCEL = 0x00000010, + APPLY = 0x00000020, + CLOSE = 0x00000040, + OK_DEFAULT = 0x00000000, + YES_DEFAULT = 0x00000000, + NO_DEFAULT = 0x00000080, + CANCEL_DEFAULT = 0x80000000, + ICON_EXCLAMATION = 0x00000100, + ICON_HAND = 0x00000200, + ICON_WARNING = ICON_EXCLAMATION, + ICON_ERROR = ICON_HAND, + ICON_QUESTION = 0x00000400, + ICON_INFORMATION = 0x00000800, + ICON_STOP = ICON_HAND, + ICON_ASTERISK = ICON_INFORMATION, + ICON_MASK = (0x00000100|0x00000200|0x00000400|0x00000800), + FORWARD = 0x00001000, + BACKWARD = 0x00002000, + RESET = 0x00004000, + HELP = 0x00008000, + MORE = 0x00010000, + SETUP = 0x00020000, + // Force blocking, modal message box dialog (not just OS notification) + MODAL = 0x00040000, + + /** Predefined combinations for certain default usage cases */ + MSG_INFORMATION = ICON_INFORMATION, + MSG_WARNING = (ICON_WARNING | OK | MODAL), + MSG_ERROR = (ICON_ERROR | OK | MODAL) + + }; + + /** Show message box. */ + boost::signals2::signal ThreadSafeMessageBox; + + /** Ask the user whether they want to pay a fee or not. */ + boost::signals2::signal > ThreadSafeAskFee; + + /** Handle a URL passed at the command line. */ + boost::signals2::signal ThreadSafeHandleURI; + + /** Progress message during initialization. */ + boost::signals2::signal InitMessage; + + /** Initiate client shutdown. */ + boost::signals2::signal QueueShutdown; + + /** Translate a message to the native language of the user. */ + boost::signals2::signal Translate; + + /** Block chain changed. */ + boost::signals2::signal NotifyBlocksChanged; + + /** Number of network connections changed. */ + boost::signals2::signal NotifyNumConnectionsChanged; + + /** + * New, updated or cancelled alert. + * @note called with lock cs_mapAlerts held. + */ + boost::signals2::signal NotifyAlertChanged; +}; + +extern CClientUIInterface uiInterface; + +/** + * Translation function: Call Translate signal on UI interface, which returns a boost::optional result. + * If no translation slot is registered, nothing is returned, and simply return the input. + */ +inline std::string _(const char* psz) +{ + boost::optional rv = uiInterface.Translate(psz); + return rv ? (*rv) : psz; +} + +#endif diff --git a/src/main.cpp b/src/main.cpp index db2239f..328d61b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,7 +8,7 @@ #include "db.h" #include "txdb.h" #include "init.h" -#include "ui_interface.h" +#include "interface.h" #include "checkqueue.h" #include "kernel.h" #include diff --git a/src/net.cpp b/src/net.cpp index a47f2fd..9ae84ac 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -8,7 +8,7 @@ #include "net.h" #include "init.h" #include "addrman.h" -#include "ui_interface.h" +#include "interface.h" #include "miner.h" #include "ntp.h" diff --git a/src/noui.cpp b/src/noui.cpp index 965b39d..91fb8d0 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2012 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "ui_interface.h" +#include "interface.h" #include "init.h" #include "bitcoinrpc.h" diff --git a/src/ntp.cpp b/src/ntp.cpp index 76b0afd..6cf038c 100644 --- a/src/ntp.cpp +++ b/src/ntp.cpp @@ -14,7 +14,7 @@ #include "netbase.h" #include "net.h" //#include "util.h" -#include "ui_interface.h" +#include "interface.h" extern int GetRandInt(int nMax); diff --git a/src/qt/aboutdialog.ui b/src/qt/aboutdialog.ui new file mode 100644 index 0000000..9005c3b --- /dev/null +++ b/src/qt/aboutdialog.ui @@ -0,0 +1,158 @@ + + + AboutDialog + + + + 0 + 0 + 640 + 416 + + + + About NovaCoin + + + + + + + 0 + 0 + + + + :/icons/bitcoin + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + IBeamCursor + + + <b>NovaCoin</b> version + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + IBeamCursor + + + 0.3.666-beta + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + IBeamCursor + + + Copyright © 2009-2019 The Bitcoin developers +Copyright © 2011-2012 The PPCoin Developers +Copyright © 2014 The Peerunity Developers +Copyright © 2014 The EmerCoin Developers +Copyright © 2012-2020 The NovaCoin developers + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + IBeamCursor + + + <html><head/><body><p><br/>This is experimental software.</p><p>Distributed under the MIT/X11 software license, see the accompanying file COPYING or <br/><a href="http://www.opensource.org/licenses/mit-license.php"><span style=" text-decoration: underline; color:#0000ff;">http://www.opensource.org/licenses/mit-license.php</span></a>.</p><p>Main icon was designed by VisualPharm.com (<a href="mailto:team@visualpharm.com"><span style=" text-decoration: underline; color:#0000ff;">team@visualpharm.com</span></a>). This product also includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (<a href="http://www.openssl.org/"><span style=" text-decoration: underline; color:#0000ff;">http://www.openssl.org/</span></a>) and cryptographic software written by Eric Young (<a href="mailto:eay@cryptsoft.com"><span style=" text-decoration: underline; color:#0000ff;">eay@cryptsoft.com</span></a>).</p><p><br/></p></body></html> + + + true + + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + + + + + + + + + + diff --git a/src/qt/addressbookpage.ui b/src/qt/addressbookpage.ui new file mode 100644 index 0000000..d0fc71a --- /dev/null +++ b/src/qt/addressbookpage.ui @@ -0,0 +1,164 @@ + + + AddressBookPage + + + + 0 + 0 + 799 + 380 + + + + Address Book + + + + + + These are your NovaCoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. + + + Qt::PlainText + + + true + + + + + + + Qt::CustomContextMenu + + + Double-click to edit address or label + + + false + + + true + + + QAbstractItemView::SingleSelection + + + QAbstractItemView::SelectRows + + + true + + + false + + + + + + + + + Create a new address + + + &New Address + + + + :/icons/add:/icons/add + + + + + + + Copy the currently selected address to the system clipboard + + + &Copy Address + + + + :/icons/editcopy:/icons/editcopy + + + + + + + Sign a message to prove you own a NovaCoin address + + + Sign &Message + + + + :/icons/edit:/icons/edit + + + + + + + Verify a message to ensure it was signed with a specified NovaCoin address + + + &Verify Message + + + + :/icons/transaction_0:/icons/transaction_0 + + + + + + + Delete the currently selected address from the list + + + &Delete + + + + :/icons/remove:/icons/remove + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + QDialogButtonBox::Ok + + + + + + + + + + + + diff --git a/src/qt/askpassphrasedialog.ui b/src/qt/askpassphrasedialog.ui new file mode 100644 index 0000000..2516904 --- /dev/null +++ b/src/qt/askpassphrasedialog.ui @@ -0,0 +1,151 @@ + + + AskPassphraseDialog + + + + 0 + 0 + 598 + 198 + + + + + 0 + 0 + + + + + 550 + 0 + + + + Passphrase Dialog + + + + + + Qt::RichText + + + true + + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Enter passphrase + + + + + + + QLineEdit::Password + + + + + + + New passphrase + + + + + + + QLineEdit::Password + + + + + + + Repeat new passphrase + + + + + + + QLineEdit::Password + + + + + + + + 75 + true + + + + + + + Qt::AlignCenter + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + AskPassphraseDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + AskPassphraseDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index f99ee0f..4c9af3a 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -9,7 +9,7 @@ #include "guiconstants.h" #include "init.h" -#include "ui_interface.h" +#include "interface.h" #include "qtipcserver.h" #include "intro.h" diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 69e5c20..5b72777 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -1,59 +1,59 @@ - res/icons/novacoin-128.png - res/icons/address-book.png - res/icons/quit.png - res/icons/send.png - res/icons/novacoin-16.png - res/icons/connect0_16.png - res/icons/connect1_16.png - res/icons/connect2_16.png - res/icons/connect3_16.png - res/icons/connect4_16.png - res/icons/mining_active.png - res/icons/mining_inactive.png - res/icons/transaction0.png - res/icons/transaction2.png - res/icons/clock1.png - res/icons/clock2.png - res/icons/clock3.png - res/icons/clock4.png - res/icons/clock5.png - res/icons/configure.png - res/icons/receive.png - res/icons/editpaste.png - res/icons/editcopy.png - res/icons/add.png - res/icons/novacoin-128.png - res/icons/novacoin-16.png - res/icons/edit.png - res/icons/history.png - res/icons/overview.png - res/icons/export.png - res/icons/synced.png - res/icons/remove.png - res/icons/tx_mined.png - res/icons/tx_input.png - res/icons/tx_output.png - res/icons/tx_inout.png - res/icons/lock_closed.png - res/icons/lock_open.png - res/icons/key.png - res/icons/filesave.png - res/icons/qrcode.png - res/icons/debugwindow.png - res/icons/dump.png - res/icons/import.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/novacoin-128.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/address-book.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/quit.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/send.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/novacoin-16.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/connect0_16.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/connect1_16.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/connect2_16.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/connect3_16.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/connect4_16.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/mining_active.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/mining_inactive.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/transaction0.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/transaction2.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/clock1.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/clock2.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/clock3.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/clock4.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/clock5.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/configure.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/receive.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/editpaste.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/editcopy.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/add.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/novacoin-128.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/novacoin-16.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/edit.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/history.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/overview.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/export.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/synced.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/remove.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/tx_mined.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/tx_input.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/tx_output.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/tx_inout.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/lock_closed.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/lock_open.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/key.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/filesave.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/qrcode.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/debugwindow.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/dump.png + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/import.png - res/images/splash2.jpg + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/images/splash2.jpg - res/movies/update_spinner.mng + ${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/movies/update_spinner.mng - locale/bitcoin_en.qm - locale/bitcoin_ru.qm - locale/bitcoin_uk.qm + ${bitcoin_en_qm} + ${bitcoin_ru_qm} + ${bitcoin_uk_qm} diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index db888a8..e59e66b 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -26,7 +26,7 @@ #include "askpassphrasedialog.h" #include "notificator.h" #include "guiutil.h" -#include "ui_interface.h" +#include "interface.h" #include "rpcconsole.h" #include "mintingview.h" diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index ec66cc3..6728a45 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -6,7 +6,7 @@ #include "alert.h" #include "main.h" -#include "ui_interface.h" +#include "interface.h" #include #include diff --git a/src/qt/coincontroldialog.ui b/src/qt/coincontroldialog.ui new file mode 100644 index 0000000..19b4ad5 --- /dev/null +++ b/src/qt/coincontroldialog.ui @@ -0,0 +1,554 @@ + + + CoinControlDialog + + + + 0 + 0 + 1000 + 500 + + + + Coin Control + + + + + + 0 + + + 10 + + + + + 10 + + + 10 + + + 6 + + + 6 + + + + + font-weight:bold; + + + Quantity: + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0 + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + font-weight:bold; + + + Bytes: + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0 + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + 10 + + + 10 + + + 6 + + + 6 + + + + + font-weight:bold; + + + Amount: + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0.00 NVC + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + font-weight:bold; + + + Priority: + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + 10 + + + 10 + + + 6 + + + 6 + + + + + font-weight:bold; + + + Fee: + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0.00 NVC + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + false + + + font-weight:bold; + + + Low Output: + + + + + + + false + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + no + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + 10 + + + 10 + + + 6 + + + 6 + + + + + font-weight:bold; + + + After Fee: + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0.00 NVC + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + false + + + font-weight:bold; + + + Change: + + + + + + + false + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0.00 NVC + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + + + + 0 + 40 + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + + 10 + 0 + 781 + 41 + + + + + 14 + + + + + + 0 + 0 + + + + (un)select all + + + + + + + + 0 + 0 + + + + Tree mode + + + true + + + + + + + + 0 + 0 + + + + List mode + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Qt::CustomContextMenu + + + false + + + 12 + + + true + + + false + + + + + + + + + Amount + + + + + Label + + + + + Address + + + + + Date + + + + + Confirmations + + + Confirmed + + + + + Weight + + + + + Priority + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + + + + + + CoinControlTreeWidget + QTreeWidget +
coincontroltreewidget.h
+ + + + + diff --git a/src/qt/editaddressdialog.ui b/src/qt/editaddressdialog.ui new file mode 100644 index 0000000..b4a4c1b --- /dev/null +++ b/src/qt/editaddressdialog.ui @@ -0,0 +1,105 @@ + + + EditAddressDialog + + + + 0 + 0 + 457 + 126 + + + + Edit Address + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + &Label + + + labelEdit + + + + + + + The label associated with this address book entry + + + + + + + &Address + + + addressEdit + + + + + + + The address associated with this address book entry. This can only be modified for sending addresses. + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + EditAddressDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + EditAddressDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui deleted file mode 100644 index 9005c3b..0000000 --- a/src/qt/forms/aboutdialog.ui +++ /dev/null @@ -1,158 +0,0 @@ - - - AboutDialog - - - - 0 - 0 - 640 - 416 - - - - About NovaCoin - - - - - - - 0 - 0 - - - - :/icons/bitcoin - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - IBeamCursor - - - <b>NovaCoin</b> version - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - IBeamCursor - - - 0.3.666-beta - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - IBeamCursor - - - Copyright © 2009-2019 The Bitcoin developers -Copyright © 2011-2012 The PPCoin Developers -Copyright © 2014 The Peerunity Developers -Copyright © 2014 The EmerCoin Developers -Copyright © 2012-2020 The NovaCoin developers - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - IBeamCursor - - - <html><head/><body><p><br/>This is experimental software.</p><p>Distributed under the MIT/X11 software license, see the accompanying file COPYING or <br/><a href="http://www.opensource.org/licenses/mit-license.php"><span style=" text-decoration: underline; color:#0000ff;">http://www.opensource.org/licenses/mit-license.php</span></a>.</p><p>Main icon was designed by VisualPharm.com (<a href="mailto:team@visualpharm.com"><span style=" text-decoration: underline; color:#0000ff;">team@visualpharm.com</span></a>). This product also includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (<a href="http://www.openssl.org/"><span style=" text-decoration: underline; color:#0000ff;">http://www.openssl.org/</span></a>) and cryptographic software written by Eric Young (<a href="mailto:eay@cryptsoft.com"><span style=" text-decoration: underline; color:#0000ff;">eay@cryptsoft.com</span></a>).</p><p><br/></p></body></html> - - - true - - - true - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Ok - - - - - - - - - - - - diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui deleted file mode 100644 index d0fc71a..0000000 --- a/src/qt/forms/addressbookpage.ui +++ /dev/null @@ -1,164 +0,0 @@ - - - AddressBookPage - - - - 0 - 0 - 799 - 380 - - - - Address Book - - - - - - These are your NovaCoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. - - - Qt::PlainText - - - true - - - - - - - Qt::CustomContextMenu - - - Double-click to edit address or label - - - false - - - true - - - QAbstractItemView::SingleSelection - - - QAbstractItemView::SelectRows - - - true - - - false - - - - - - - - - Create a new address - - - &New Address - - - - :/icons/add:/icons/add - - - - - - - Copy the currently selected address to the system clipboard - - - &Copy Address - - - - :/icons/editcopy:/icons/editcopy - - - - - - - Sign a message to prove you own a NovaCoin address - - - Sign &Message - - - - :/icons/edit:/icons/edit - - - - - - - Verify a message to ensure it was signed with a specified NovaCoin address - - - &Verify Message - - - - :/icons/transaction_0:/icons/transaction_0 - - - - - - - Delete the currently selected address from the list - - - &Delete - - - - :/icons/remove:/icons/remove - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - QDialogButtonBox::Ok - - - - - - - - - - - - diff --git a/src/qt/forms/askpassphrasedialog.ui b/src/qt/forms/askpassphrasedialog.ui deleted file mode 100644 index 2516904..0000000 --- a/src/qt/forms/askpassphrasedialog.ui +++ /dev/null @@ -1,151 +0,0 @@ - - - AskPassphraseDialog - - - - 0 - 0 - 598 - 198 - - - - - 0 - 0 - - - - - 550 - 0 - - - - Passphrase Dialog - - - - - - Qt::RichText - - - true - - - - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - Enter passphrase - - - - - - - QLineEdit::Password - - - - - - - New passphrase - - - - - - - QLineEdit::Password - - - - - - - Repeat new passphrase - - - - - - - QLineEdit::Password - - - - - - - - 75 - true - - - - - - - Qt::AlignCenter - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - AskPassphraseDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - AskPassphraseDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui deleted file mode 100644 index 19b4ad5..0000000 --- a/src/qt/forms/coincontroldialog.ui +++ /dev/null @@ -1,554 +0,0 @@ - - - CoinControlDialog - - - - 0 - 0 - 1000 - 500 - - - - Coin Control - - - - - - 0 - - - 10 - - - - - 10 - - - 10 - - - 6 - - - 6 - - - - - font-weight:bold; - - - Quantity: - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0 - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - font-weight:bold; - - - Bytes: - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0 - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - 10 - - - 10 - - - 6 - - - 6 - - - - - font-weight:bold; - - - Amount: - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0.00 NVC - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - font-weight:bold; - - - Priority: - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - 10 - - - 10 - - - 6 - - - 6 - - - - - font-weight:bold; - - - Fee: - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0.00 NVC - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - false - - - font-weight:bold; - - - Low Output: - - - - - - - false - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - no - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - 10 - - - 10 - - - 6 - - - 6 - - - - - font-weight:bold; - - - After Fee: - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0.00 NVC - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - false - - - font-weight:bold; - - - Change: - - - - - - - false - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0.00 NVC - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - - - - 0 - 40 - - - - QFrame::StyledPanel - - - QFrame::Sunken - - - - - 10 - 0 - 781 - 41 - - - - - 14 - - - - - - 0 - 0 - - - - (un)select all - - - - - - - - 0 - 0 - - - - Tree mode - - - true - - - - - - - - 0 - 0 - - - - List mode - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Qt::CustomContextMenu - - - false - - - 12 - - - true - - - false - - - - - - - - - Amount - - - - - Label - - - - - Address - - - - - Date - - - - - Confirmations - - - Confirmed - - - - - Weight - - - - - Priority - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - - - - Qt::Horizontal - - - QDialogButtonBox::Ok - - - - - - - - CoinControlTreeWidget - QTreeWidget -
coincontroltreewidget.h
- - - - - diff --git a/src/qt/forms/editaddressdialog.ui b/src/qt/forms/editaddressdialog.ui deleted file mode 100644 index b4a4c1b..0000000 --- a/src/qt/forms/editaddressdialog.ui +++ /dev/null @@ -1,105 +0,0 @@ - - - EditAddressDialog - - - - 0 - 0 - 457 - 126 - - - - Edit Address - - - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - &Label - - - labelEdit - - - - - - - The label associated with this address book entry - - - - - - - &Address - - - addressEdit - - - - - - - The address associated with this address book entry. This can only be modified for sending addresses. - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - EditAddressDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - EditAddressDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/src/qt/forms/intro.ui b/src/qt/forms/intro.ui deleted file mode 100644 index cfe6069..0000000 --- a/src/qt/forms/intro.ui +++ /dev/null @@ -1,266 +0,0 @@ - - - Intro - - - - 0 - 0 - 480 - 288 - - - - Welcome - - - - - - QLabel { font-style:italic; } - - - Welcome to novacoin-qt. - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 15 - - - - - - - - As this is the first time the program is launched, you can choose where novacoin-qt will store its data. - - - true - - - - - - - novacoin-qt will download and store a copy of the Novacoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory. - - - true - - - - - - - Use the default data directory - - - - - - - Use a custom data directory: - - - - - - - 0 - - - QLayout::SetDefaultConstraint - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 60 - 20 - - - - - - - - QLayout::SetDefaultConstraint - - - - - - - - - - - 0 - 0 - - - - - 30 - 16777215 - - - - … - - - false - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 5 - - - - - - - - - 1 - 0 - - - - - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 5 - - - - - - - - - 0 - 0 - - - - Qt::RichText - - - true - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - Intro - accept() - - - 20 - 20 - - - 20 - 20 - - - - - buttonBox - rejected() - Intro - reject() - - - 20 - 20 - - - 20 - 20 - - - - - diff --git a/src/qt/forms/multisigaddressentry.ui b/src/qt/forms/multisigaddressentry.ui deleted file mode 100644 index c145f07..0000000 --- a/src/qt/forms/multisigaddressentry.ui +++ /dev/null @@ -1,170 +0,0 @@ - - - MultisigAddressEntry - - - - 0 - 0 - 729 - 136 - - - - Form - - - QFrame::StyledPanel - - - QFrame::Sunken - - - - - - Public &key: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - pubkey - - - - - - - 0 - - - - - The public key of an address - - - Enter a public key - - - - - - - Paste public key from clipboard - - - - - - - :/icons/editpaste:/icons/editpaste - - - Alt+P - - - - - - - Remove this public key - - - - - - - :/icons/remove:/icons/remove - - - - - - - - - &Address: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - address - - - - - - - 0 - - - - - true - - - Address associated to the public key - - - Enter one of your addresses to get its public key - - - - - - - Choose address from address book - - - - - - - :/icons/address-book:/icons/address-book - - - Alt+A - - - - - - - - - Label: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - true - - - - - - true - - - - - - - - QValidatedLineEdit - QLineEdit -
qvalidatedlineedit.h
- - - - - - - diff --git a/src/qt/forms/multisigdialog.ui b/src/qt/forms/multisigdialog.ui deleted file mode 100644 index 2068d2f..0000000 --- a/src/qt/forms/multisigdialog.ui +++ /dev/null @@ -1,793 +0,0 @@ - - - MultisigDialog - - - - 0 - 0 - 1327 - 595 - - - - Multisig - - - - - - 0 - - - - &Create Address - - - - - - true - - - - - 0 - 0 - 1283 - 345 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - Add a member to the signing pool - - - &Add public key... - - - - :/icons/add:/icons/add - - - - - - - - 0 - 0 - - - - Remove all public key fields - - - Clear all - - - - :/icons/remove:/icons/remove - - - 300 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Required signatures: - - - - - - - - 0 - 0 - - - - - 127 - 0 - - - - - - - 2 - - - true - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Enter a number - - - - - - - / 1 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Create multisig address - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Multisig address: - - - - - - - true - - - - - - - Copy the multisig address to the system clipboard - - - - - - - :/icons/editcopy:/icons/editcopy - - - false - - - - - - - - - - - Redeem script: - - - - - - - true - - - - - - - Copy the redeem script to the system clipboard - - - - - - - :/icons/editcopy:/icons/editcopy - - - false - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - The redeem script will be required to spend the funds sent to the multisig address - - - Save redeem script - - - - - - - Add the multisig address to your personal addresses - - - Add address to wallet - - - - - - - - - - &Spend Funds - - - - - - - - - - Inputs - - - - - - - 0 - 0 - - - - true - - - - - 0 - 0 - 616 - 271 - - - - - - - - - - Qt::Vertical - - - - 20 - 42 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Inputs amount: - - - - - - - 123.456 - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - NVC - - - - - - - - - - - Add input... - - - - :/icons/add:/icons/add - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Outputs - - - - - - - 0 - 0 - - - - true - - - - - 0 - 0 - 615 - 243 - - - - - - - - - - Qt::Vertical - - - - 20 - 42 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Outputs amount: - - - - - - - 123.456 - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - NVC - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Fee: - - - - - - - 123.456 - - - - - - - NVC - - - - - - - - - - - Add output... - - - - :/icons/add:/icons/add - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - Create transaction - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - 0 - 0 - - - - Enter a raw transaction or create a new one - - - - - - - - - - - - - - :/icons/editcopy:/icons/editcopy - - - false - - - - - - - Paste transaction from clipboard - - - - - - - :/icons/editpaste:/icons/editpaste - - - Alt+P - - - false - - - - - - - - - - - Sign transaction - - - - :/icons/edit:/icons/edit - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - 0 - 0 - - - - true - - - - - - - - - - - - - - :/icons/editcopy:/icons/editcopy - - - false - - - - - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Send transaction - - - - :/icons/send:/icons/send - - - - - - - - - - - - - - - - - - diff --git a/src/qt/forms/multisiginputentry.ui b/src/qt/forms/multisiginputentry.ui deleted file mode 100644 index 17662fc..0000000 --- a/src/qt/forms/multisiginputentry.ui +++ /dev/null @@ -1,160 +0,0 @@ - - -MultisigInputEntry - - - -0 -0 -729 -136 - - - -Form - - -QFrame::StyledPanel - - -QFrame::Sunken - - - - - -0 - - - - - - - -Enter a transaction id - - - - - - - - - - - - - -:/icons/editpaste:/icons/editpaste - - -Alt+P - - - - - - - - - - - - - -:/icons/remove:/icons/remove - - - - - - - - -Transaction id: - - -Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - -transactionId - - - - - - -Transaction output: - - -Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - -Redeem script: - - -Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - -redeemScript - - - - - - -0 - - - - -true - - - - - -Enter the redeem script of the address in the transaction output - - - - - - - - - - - - - -:/icons/editpaste:/icons/editpaste - - -Alt+A - - - - - - - - - - - - -QValidatedLineEdit -QLineEdit -
qvalidatedlineedit.h
- - - - - - - \ No newline at end of file diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui deleted file mode 100644 index 7cf60cf..0000000 --- a/src/qt/forms/optionsdialog.ui +++ /dev/null @@ -1,613 +0,0 @@ - - - OptionsDialog - - - - 0 - 0 - 595 - 380 - - - - Options - - - - - - QTabWidget::North - - - 1 - - - - &Main - - - - - - Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.001 recommended. - - - Qt::PlainText - - - true - - - - - - - - - Pay transaction &fee - - - Qt::PlainText - - - transactionFee - - - - - - - - - - per kilobyte - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Automatically start NovaCoin after logging in to the system. - - - &Start NovaCoin on system login - - - - - - - Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached. - - - &Detach databases at shutdown - - - - - - - Qt::Vertical - - - - 17 - 153 - - - - - - - - - &Network - - - - - - Connect to the NovaCoin network through a SOCKS proxy (e.g. when connecting through Tor). - - - &Connect through SOCKS proxy: - - - - - - - - - Proxy &IP: - - - Qt::PlainText - - - proxyIp - - - - - - - - 140 - 16777215 - - - - IP address of the proxy (e.g. 127.0.0.1) - - - - - - - &Port: - - - Qt::PlainText - - - proxyPort - - - - - - - - 55 - 16777215 - - - - Port of the proxy (e.g. 9050) - - - - - - - SOCKS &Version: - - - Qt::PlainText - - - socksVersion - - - - - - - SOCKS version of the proxy (e.g. 5) - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Connect through &Tor: - - - - - - - - - - 60 - 0 - - - - Tor IP: - - - - - - - - 115 - 16777215 - - - - - - - - Port: - - - - - - - - 55 - 16777215 - - - - - - - - Use Tor only - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Tor name: - - - Qt::PlainText - - - torName - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Seeder command: - - - - - - - - - - Choose ... - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - &Window - - - - - - Show only a tray icon after minimizing the window. - - - &Minimize to the tray instead of the taskbar - - - - - - - Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu. - - - M&inimize on close - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - &Display - - - - - - - - User Interface &language: - - - Qt::PlainText - - - lang - - - - - - - The user interface language can be set here. This setting will take effect after restarting NovaCoin. - - - - - - - - - - - &Unit to show amounts in: - - - Qt::PlainText - - - unit - - - - - - - Choose the default subdivision unit to show in the interface and when sending coins. - - - - - - - - - Whether to show NovaCoin addresses in the transaction list or not. - - - &Display addresses in transaction list - - - - - - - Whether to show coin control features or not. - - - Display coin &control features (experts only!) - - - - - - - - - Third party URLs (e.g. explorer.novaco.in) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |. - - - Third party transaction URLs - - - thirdPartyTxUrls - - - - - - - Third party URLs (e.g. explorer.novaco.in) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |. - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 48 - - - - - - - - - 75 - true - - - - - - - Qt::PlainText - - - true - - - - - - - Qt::Horizontal - - - - 40 - 48 - - - - - - - - &OK - - - - - - - &Cancel - - - false - - - - - - - &Apply - - - false - - - - - - - - - - BitcoinAmountField - QSpinBox -
bitcoinamountfield.h
- - - QValueComboBox - QComboBox -
qvaluecombobox.h
- - - QValidatedLineEdit - QLineEdit -
qvalidatedlineedit.h
- - - - - diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui deleted file mode 100644 index ae2a04b..0000000 --- a/src/qt/forms/overviewpage.ui +++ /dev/null @@ -1,434 +0,0 @@ - - - OverviewPage - - - - 0 - 0 - 573 - 342 - - - - Form - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - - - 75 - true - - - - Balances - - - - - - - The displayed information may be out of date. Your wallet automatically synchronizes with the NovaCoin network after a connection is established, but this process has not completed yet. - - - QLabel { color: red; } - - - (out of sync) - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - QFormLayout::AllNonFixedFieldsGrow - - - 12 - - - 12 - - - - - Your current available balance - - - Available: - - - - - - - - 75 - true - - - - IBeamCursor - - - Your current available balance - - - 0 NVC - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Total of coins that was staked, and do not yet count toward the current balance - - - Stake: - - - - - - - - 75 - true - - - - IBeamCursor - - - Total of coins that was staked, and do not yet count toward the current balance - - - 0 NVC - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Total of transactions that have yet to be confirmed, and do not yet count toward the current balance - - - Unconfirmed: - - - - - - - - 75 - true - - - - IBeamCursor - - - Total of transactions that have yet to be confirmed, and do not yet count toward the current balance - - - 0 NVC - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Mined balance that has not yet matured - - - Immature: - - - - - - - - 75 - true - - - - Mined balance that has not yet matured - - - 0 NVC - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Your unspendable balance - - - Unspendable: - - - - - - - - 75 - true - - - - IBeamCursor - - - Your unspendable balance - - - 0 NVC - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - 230 - 16777215 - - - - Qt::Horizontal - - - - - - - Your current total balance - - - Total: - - - - - - - - 75 - true - - - - Your current total balance - - - 0 NVC - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Total number of transactions in wallet - - - Number of transactions: - - - - - - - Total number of transactions in wallet - - - 0 - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - - <b>Recent transactions</b> - - - - - - - The displayed information may be out of date. Your wallet automatically synchronizes with the NovaCoin network after a connection is established, but this process has not completed yet. - - - QLabel { color: red; } - - - (out of sync) - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - QListView { background: transparent; } - - - QFrame::NoFrame - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - QAbstractItemView::NoSelection - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - diff --git a/src/qt/forms/qrcodedialog.ui b/src/qt/forms/qrcodedialog.ui deleted file mode 100644 index 52e9db3..0000000 --- a/src/qt/forms/qrcodedialog.ui +++ /dev/null @@ -1,212 +0,0 @@ - - - QRCodeDialog - - - - 0 - 0 - 340 - 530 - - - - QR Code Dialog - - - - - - - 0 - 0 - - - - - 300 - 300 - - - - Qt::PlainText - - - Qt::AlignCenter - - - true - - - - - - - - 0 - 0 - - - - - 0 - 50 - - - - true - - - Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - - true - - - Request Payment - - - - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - Label: - - - Qt::PlainText - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - lnLabel - - - - - - - - - - Message: - - - Qt::PlainText - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - lnMessage - - - - - - - - - - - 0 - 0 - - - - Amount: - - - Qt::PlainText - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - lnReqAmount - - - - - - - false - - - - 80 - 0 - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - &Save As... - - - - - - - - - - - - - BitcoinAmountField - QSpinBox -
bitcoinamountfield.h
- - - - - - chkReqPayment - clicked(bool) - lnReqAmount - setEnabled(bool) - - - 92 - 285 - - - 98 - 311 - - - - - diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui deleted file mode 100644 index 97390ea..0000000 --- a/src/qt/forms/rpcconsole.ui +++ /dev/null @@ -1,786 +0,0 @@ - - - RPCConsole - - - - 0 - 0 - 740 - 450 - - - - NovaCoin - Debug window - - - - - - 0 - - - - &Information - - - - - - - 75 - true - - - - Configuration file - - - - - - - IBeamCursor - - - N/A - - - Qt::PlainText - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Current number of blocks - - - - - - - IBeamCursor - - - N/A - - - Qt::PlainText - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - 75 - true - - - - Command-line options - - - - - - - Open the NovaCoin debug log file from the current data directory. This can take a few seconds for large log files. - - - &Open - - - false - - - - - - - - 75 - true - - - - Debug log file - - - - - - - Qt::Horizontal - - - - 404 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Show the NovaCoin-Qt help message to get a list with possible NovaCoin command-line options. - - - &Show - - - false - - - - - - - Last block time - - - - - - - - 75 - true - - - - Network - - - - - - - IBeamCursor - - - N/A - - - Qt::PlainText - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Startup time - - - - - - - On testnet - - - - - - - IBeamCursor - - - N/A - - - Qt::PlainText - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Number of connections - - - - - - - - 75 - true - - - - Block chain - - - - - - - false - - - - - - - - - - Estimated total blocks - - - - - - - IBeamCursor - - - N/A - - - Qt::PlainText - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - IBeamCursor - - - N/A - - - Qt::PlainText - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Using BerkeleyDB version - - - 10 - - - - - - - Using OpenSSL version - - - 10 - - - - - - - IBeamCursor - - - N/A - - - Qt::PlainText - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - IBeamCursor - - - N/A - - - Qt::PlainText - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Build date - - - - - - - IBeamCursor - - - N/A - - - Qt::PlainText - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Client version - - - - - - - - 75 - true - - - - NovaCoin Core - - - - - - - IBeamCursor - - - N/A - - - Qt::PlainText - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - Client name - - - - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - Open the NovaCoin configuration file from the current data directory. - - - O&pen - - - false - - - - - - - - &Console - - - - 3 - - - - - - 0 - 100 - - - - true - - - false - - - 2 - - - - - - - 3 - - - - - > - - - - - - - false - - - - - - - - 24 - 24 - - - - Clear console - - - - - - - :/icons/remove:/icons/remove - - - Ctrl+L - - - false - - - - - - - - - - &Network Traffic - - - - - - - - - 0 - 0 - - - - - - - - - - 1 - - - 288 - - - 12 - - - 6 - - - Qt::Horizontal - - - - - - - - 100 - 0 - - - - Qt::AlignCenter - - - - - - - &Clear - - - false - - - - - - - - - - - - - Totals - - - - - - - - - 0 - 0 - - - - - 10 - 0 - - - - - - - - - 0 - 255 - 0 - - - - - - - - - 0 - 255 - 0 - - - - - - - - - 0 - 255 - 0 - - - - - - - - Qt::Horizontal - - - - - - - Received: - - - - - - - - 50 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - 0 - 0 - - - - - 10 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - Qt::Horizontal - - - - - - - Sent: - - - - - - - - 50 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - Qt::Vertical - - - - 20 - 407 - - - - - - - - - - - - - - - - - - TrafficGraphWidget - QWidget -
trafficgraphwidget.h
- 1 - - clear() - - - - - - - - diff --git a/src/qt/forms/secondauthdialog.ui b/src/qt/forms/secondauthdialog.ui deleted file mode 100644 index 7d529fc..0000000 --- a/src/qt/forms/secondauthdialog.ui +++ /dev/null @@ -1,230 +0,0 @@ - - - SecondAuthDialog - - - Qt::ApplicationModal - - - - 0 - 0 - 768 - 221 - - - - Second Authentification - - - - - - You can sign hash of transaction exists in the blockchain with your addresses. - - - Qt::PlainText - - - true - - - - - - - - - The address for authentification (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5) - - - 34 - - - - - - - Choose an address from the address book - - - - - - - :/icons/address-book:/icons/address-book - - - Alt+A - - - false - - - - - - - - - - - 64 - - - - - - - Paste hash from clipboard - - - - - - - :/icons/editpaste:/icons/editpaste - - - Alt+P - - - false - - - - - - - - - 6 - - - - - - true - - - - true - - - - - - - Copy the current signature to the system clipboard - - - - - - - :/icons/editcopy:/icons/editcopy - - - Alt+C - - - false - - - - - - - - - - - Sign the hash - - - &Sign Data - - - - :/icons/edit:/icons/edit - - - false - - - - - - - Reset all sign message fields - - - Clear &All - - - - :/icons/remove:/icons/remove - - - false - - - - - - - Qt::Horizontal - - - - 10 - 48 - - - - - - - - - 75 - true - - - - - - - true - - - - - - - Qt::Horizontal - - - - 40 - 48 - - - - - - - - - - - QValidatedLineEdit - QLineEdit -
qvalidatedlineedit.h
- - - - - - - diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui deleted file mode 100644 index a87171c..0000000 --- a/src/qt/forms/sendcoinsdialog.ui +++ /dev/null @@ -1,794 +0,0 @@ - - - SendCoinsDialog - - - - 0 - 0 - 850 - 400 - - - - Send Coins - - - - 8 - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - QFrame::StyledPanel - - - QFrame::Sunken - - - - -1 - - - 0 - - - 0 - - - 0 - - - 6 - - - - - 0 - - - 10 - - - 10 - - - - - 15 - - - - - - 0 - 0 - - - - - 75 - true - - - - font-weight:bold; - - - Coin Control Features - - - - - - - - - 8 - - - 10 - - - - - - - - Inputs... - - - - - - - automatically selected - - - 5 - - - - - - - - 75 - true - - - - color:red;font-weight:bold; - - - Insufficient funds! - - - 5 - - - - - - - Qt::Horizontal - - - - 40 - 1 - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - 0 - - - - - 20 - - - 0 - - - 10 - - - - - 10 - - - 14 - - - 10 - - - 4 - - - 6 - - - - - font-weight:bold; - - - Quantity: - - - 0 - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0 - - - 0 - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - font-weight:bold; - - - Bytes: - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0 - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - 10 - - - 14 - - - 6 - - - 4 - - - 6 - - - - - font-weight:bold; - - - Amount: - - - 0 - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0.00 NVC - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - font-weight:bold; - - - Priority: - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - medium - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - 10 - - - 14 - - - 6 - - - 4 - - - 6 - - - - - font-weight:bold; - - - Fee: - - - 0 - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0.00 NVC - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - font-weight:bold; - - - Low Output: - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - no - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - 10 - - - 14 - - - 6 - - - 4 - - - 6 - - - - - font-weight:bold; - - - After Fee: - - - 0 - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0.00 NVC - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - font-weight:bold; - - - Change - - - - - - - - Monospace - 10 - - - - IBeamCursor - - - Qt::ActionsContextMenu - - - 0.00 NVC - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - - - - - - 12 - - - QLayout::SetDefaultConstraint - - - 5 - - - 5 - - - - - custom change address - - - - - - - false - - - - 0 - 0 - - - - - - - - false - - - Choose address from address book - - - - - - - :/icons/address-book:/icons/address-book - - - Alt+A - - - - - - - false - - - Paste address from clipboard - - - - - - - :/icons/editpaste:/icons/editpaste - - - Alt+P - - - - - - - - - Qt::Vertical - - - - 800 - 1 - - - - - - - - - - - - - true - - - - - 0 - 0 - 830 - 165 - - - - - 0 - - - - - 6 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - Send to multiple recipients at once - - - Add &Recipient - - - - :/icons/add:/icons/add - - - false - - - - - - - - 0 - 0 - - - - Remove all transaction fields - - - Clear &All - - - - :/icons/remove:/icons/remove - - - 300 - - - false - - - - - - - 3 - - - - - Balance: - - - - - - - IBeamCursor - - - 123.456 NVC - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 150 - 0 - - - - Confirm the send action - - - S&end - - - - :/icons/send:/icons/send - - - true - - - - - - - - - - - - diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui deleted file mode 100644 index bdbffb1..0000000 --- a/src/qt/forms/sendcoinsentry.ui +++ /dev/null @@ -1,169 +0,0 @@ - - - SendCoinsEntry - - - - 0 - 0 - 729 - 136 - - - - Form - - - QFrame::StyledPanel - - - QFrame::Sunken - - - - 12 - - - - - A&mount: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - payAmount - - - - - - - Pay &To: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - payTo - - - - - - - - - - 0 - - - - - true - - - Enter a label for this address to add it to your address book - - - - - - - - - &Label: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - addAsLabel - - - - - - - 0 - - - - - The address to send the payment to (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5) - - - 100 - - - - - - - Choose address from address book - - - - - - - :/icons/address-book:/icons/address-book - - - Alt+A - - - - - - - Paste address from clipboard - - - - - - - :/icons/editpaste:/icons/editpaste - - - Alt+P - - - - - - - Remove this recipient - - - - - - - :/icons/remove:/icons/remove - - - - - - - - - - QValidatedLineEdit - QWidget -
qvalidatedlineedit.h
- - - BitcoinAmountField - QLineEdit -
bitcoinamountfield.h
- 1 - - - - - - - diff --git a/src/qt/forms/signverifymessagedialog.ui b/src/qt/forms/signverifymessagedialog.ui deleted file mode 100644 index 19ce198..0000000 --- a/src/qt/forms/signverifymessagedialog.ui +++ /dev/null @@ -1,386 +0,0 @@ - - - SignVerifyMessageDialog - - - Qt::ApplicationModal - - - - 0 - 0 - 700 - 380 - - - - Signatures - Sign / Verify a Message - - - - - - 1 - - - - &Sign Message - - - - - - You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. - - - Qt::PlainText - - - true - - - - - - - 0 - - - - - The address to sign the message with (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5) - - - 34 - - - - - - - Choose an address from the address book - - - - - - - :/icons/address-book:/icons/address-book - - - Alt+A - - - false - - - - - - - Paste address from clipboard - - - - - - - :/icons/editpaste:/icons/editpaste - - - Alt+P - - - false - - - - - - - - - Enter the message you want to sign here - - - - - - - 0 - - - - - - true - - - - true - - - - - - - Copy the current signature to the system clipboard - - - - - - - :/icons/editcopy:/icons/editcopy - - - false - - - - - - - - - - - Sign the message to prove you own this NovaCoin address - - - &Sign Message - - - - :/icons/edit:/icons/edit - - - false - - - - - - - Reset all sign message fields - - - Clear &All - - - - :/icons/remove:/icons/remove - - - false - - - - - - - Qt::Horizontal - - - - 40 - 48 - - - - - - - - - 75 - true - - - - - - - true - - - - - - - Qt::Horizontal - - - - 40 - 48 - - - - - - - - - - - &Verify Message - - - - - - Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. - - - Qt::PlainText - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - 0 - - - - - The address the message was signed with (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5) - - - 34 - - - - - - - Choose an address from the address book - - - - - - - :/icons/address-book:/icons/address-book - - - Alt+A - - - false - - - - - - - - - - - - - - - - - Verify the message to ensure it was signed with the specified NovaCoin address - - - &Verify Message - - - - :/icons/transaction_0:/icons/transaction_0 - - - false - - - - - - - Reset all verify message fields - - - Clear &All - - - - :/icons/remove:/icons/remove - - - false - - - - - - - Qt::Horizontal - - - - 40 - 48 - - - - - - - - - 75 - true - - - - - - - true - - - - - - - Qt::Horizontal - - - - 40 - 48 - - - - - - - - - - - - - - - QValidatedLineEdit - QLineEdit -
qvalidatedlineedit.h
- - - - - - - diff --git a/src/qt/forms/transactiondescdialog.ui b/src/qt/forms/transactiondescdialog.ui deleted file mode 100644 index dd78c38..0000000 --- a/src/qt/forms/transactiondescdialog.ui +++ /dev/null @@ -1,74 +0,0 @@ - - - TransactionDescDialog - - - - 0 - 0 - 620 - 250 - - - - Transaction details - - - - - - This pane shows a detailed description of the transaction - - - true - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Close - - - - - - - - - buttonBox - accepted() - TransactionDescDialog - close() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - TransactionDescDialog - close() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/src/qt/intro.ui b/src/qt/intro.ui new file mode 100644 index 0000000..cfe6069 --- /dev/null +++ b/src/qt/intro.ui @@ -0,0 +1,266 @@ + + + Intro + + + + 0 + 0 + 480 + 288 + + + + Welcome + + + + + + QLabel { font-style:italic; } + + + Welcome to novacoin-qt. + + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 15 + + + + + + + + As this is the first time the program is launched, you can choose where novacoin-qt will store its data. + + + true + + + + + + + novacoin-qt will download and store a copy of the Novacoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory. + + + true + + + + + + + Use the default data directory + + + + + + + Use a custom data directory: + + + + + + + 0 + + + QLayout::SetDefaultConstraint + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 60 + 20 + + + + + + + + QLayout::SetDefaultConstraint + + + + + + + + + + + 0 + 0 + + + + + 30 + 16777215 + + + + … + + + false + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + + + + + 1 + 0 + + + + + + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + + + + + 0 + 0 + + + + Qt::RichText + + + true + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + Intro + accept() + + + 20 + 20 + + + 20 + 20 + + + + + buttonBox + rejected() + Intro + reject() + + + 20 + 20 + + + 20 + 20 + + + + + diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 9fcb6aa..792c611 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -1,7 +1,6 @@ -UTF-8 AboutDialog diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts index 216b260..d49942d 100644 --- a/src/qt/locale/bitcoin_ru.ts +++ b/src/qt/locale/bitcoin_ru.ts @@ -1,7 +1,6 @@ -UTF-8 AboutDialog diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index 01948af..e81aa20 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -1,7 +1,6 @@ -UTF-8 AboutDialog diff --git a/src/qt/locale/translations.pro b/src/qt/locale/translations.pro deleted file mode 100644 index ada7a2f..0000000 --- a/src/qt/locale/translations.pro +++ /dev/null @@ -1,17 +0,0 @@ -CODECFORTR = UTF-8 - -# for lrelease/lupdate -# also add new translations to src/qt/bitcoin.qrc under translations/ -TRANSLATIONS = $$files(bitcoin_*.ts) - -isEmpty(QM_DIR):QM_DIR = $$PWD/src/qt/locale -# automatically build translations, so they can be included in resource file -TSQM.name = lrelease ${QMAKE_FILE_IN} -TSQM.input = TRANSLATIONS -TSQM.output = $$QM_DIR/${QMAKE_FILE_BASE}.qm -TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} -TSQM.CONFIG = no_link -QMAKE_EXTRA_COMPILERS += TSQM - -windows:DEFINES += WIN32 -windows:RC_FILE = $$PWD/src/qt/res/bitcoin-qt.rc diff --git a/src/qt/multisigaddressentry.ui b/src/qt/multisigaddressentry.ui new file mode 100644 index 0000000..c145f07 --- /dev/null +++ b/src/qt/multisigaddressentry.ui @@ -0,0 +1,170 @@ + + + MultisigAddressEntry + + + + 0 + 0 + 729 + 136 + + + + Form + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + + + Public &key: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + pubkey + + + + + + + 0 + + + + + The public key of an address + + + Enter a public key + + + + + + + Paste public key from clipboard + + + + + + + :/icons/editpaste:/icons/editpaste + + + Alt+P + + + + + + + Remove this public key + + + + + + + :/icons/remove:/icons/remove + + + + + + + + + &Address: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + address + + + + + + + 0 + + + + + true + + + Address associated to the public key + + + Enter one of your addresses to get its public key + + + + + + + Choose address from address book + + + + + + + :/icons/address-book:/icons/address-book + + + Alt+A + + + + + + + + + Label: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + true + + + + + + true + + + + + + + + QValidatedLineEdit + QLineEdit +
qvalidatedlineedit.h
+ + + + + + + diff --git a/src/qt/multisigdialog.ui b/src/qt/multisigdialog.ui new file mode 100644 index 0000000..2068d2f --- /dev/null +++ b/src/qt/multisigdialog.ui @@ -0,0 +1,793 @@ + + + MultisigDialog + + + + 0 + 0 + 1327 + 595 + + + + Multisig + + + + + + 0 + + + + &Create Address + + + + + + true + + + + + 0 + 0 + 1283 + 345 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + Add a member to the signing pool + + + &Add public key... + + + + :/icons/add:/icons/add + + + + + + + + 0 + 0 + + + + Remove all public key fields + + + Clear all + + + + :/icons/remove:/icons/remove + + + 300 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Required signatures: + + + + + + + + 0 + 0 + + + + + 127 + 0 + + + + + + + 2 + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + Enter a number + + + + + + + / 1 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Create multisig address + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Multisig address: + + + + + + + true + + + + + + + Copy the multisig address to the system clipboard + + + + + + + :/icons/editcopy:/icons/editcopy + + + false + + + + + + + + + + + Redeem script: + + + + + + + true + + + + + + + Copy the redeem script to the system clipboard + + + + + + + :/icons/editcopy:/icons/editcopy + + + false + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + The redeem script will be required to spend the funds sent to the multisig address + + + Save redeem script + + + + + + + Add the multisig address to your personal addresses + + + Add address to wallet + + + + + + + + + + &Spend Funds + + + + + + + + + + Inputs + + + + + + + 0 + 0 + + + + true + + + + + 0 + 0 + 616 + 271 + + + + + + + + + + Qt::Vertical + + + + 20 + 42 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Inputs amount: + + + + + + + 123.456 + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + NVC + + + + + + + + + + + Add input... + + + + :/icons/add:/icons/add + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Outputs + + + + + + + 0 + 0 + + + + true + + + + + 0 + 0 + 615 + 243 + + + + + + + + + + Qt::Vertical + + + + 20 + 42 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Outputs amount: + + + + + + + 123.456 + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + NVC + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Fee: + + + + + + + 123.456 + + + + + + + NVC + + + + + + + + + + + Add output... + + + + :/icons/add:/icons/add + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + Create transaction + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + 0 + 0 + + + + Enter a raw transaction or create a new one + + + + + + + + + + + + + + :/icons/editcopy:/icons/editcopy + + + false + + + + + + + Paste transaction from clipboard + + + + + + + :/icons/editpaste:/icons/editpaste + + + Alt+P + + + false + + + + + + + + + + + Sign transaction + + + + :/icons/edit:/icons/edit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + 0 + 0 + + + + true + + + + + + + + + + + + + + :/icons/editcopy:/icons/editcopy + + + false + + + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Send transaction + + + + :/icons/send:/icons/send + + + + + + + + + + + + + + + + + + diff --git a/src/qt/multisiginputentry.ui b/src/qt/multisiginputentry.ui new file mode 100644 index 0000000..17662fc --- /dev/null +++ b/src/qt/multisiginputentry.ui @@ -0,0 +1,160 @@ + + +MultisigInputEntry + + + +0 +0 +729 +136 + + + +Form + + +QFrame::StyledPanel + + +QFrame::Sunken + + + + + +0 + + + + + + + +Enter a transaction id + + + + + + + + + + + + + +:/icons/editpaste:/icons/editpaste + + +Alt+P + + + + + + + + + + + + + +:/icons/remove:/icons/remove + + + + + + + + +Transaction id: + + +Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + +transactionId + + + + + + +Transaction output: + + +Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + +Redeem script: + + +Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + +redeemScript + + + + + + +0 + + + + +true + + + + + +Enter the redeem script of the address in the transaction output + + + + + + + + + + + + + +:/icons/editpaste:/icons/editpaste + + +Alt+A + + + + + + + + + + + + +QValidatedLineEdit +QLineEdit +
qvalidatedlineedit.h
+ + + + + + + \ No newline at end of file diff --git a/src/qt/optionsdialog.ui b/src/qt/optionsdialog.ui new file mode 100644 index 0000000..7cf60cf --- /dev/null +++ b/src/qt/optionsdialog.ui @@ -0,0 +1,613 @@ + + + OptionsDialog + + + + 0 + 0 + 595 + 380 + + + + Options + + + + + + QTabWidget::North + + + 1 + + + + &Main + + + + + + Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.001 recommended. + + + Qt::PlainText + + + true + + + + + + + + + Pay transaction &fee + + + Qt::PlainText + + + transactionFee + + + + + + + + + + per kilobyte + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Automatically start NovaCoin after logging in to the system. + + + &Start NovaCoin on system login + + + + + + + Detach block and address databases at shutdown. This means they can be moved to another data directory, but it slows down shutdown. The wallet is always detached. + + + &Detach databases at shutdown + + + + + + + Qt::Vertical + + + + 17 + 153 + + + + + + + + + &Network + + + + + + Connect to the NovaCoin network through a SOCKS proxy (e.g. when connecting through Tor). + + + &Connect through SOCKS proxy: + + + + + + + + + Proxy &IP: + + + Qt::PlainText + + + proxyIp + + + + + + + + 140 + 16777215 + + + + IP address of the proxy (e.g. 127.0.0.1) + + + + + + + &Port: + + + Qt::PlainText + + + proxyPort + + + + + + + + 55 + 16777215 + + + + Port of the proxy (e.g. 9050) + + + + + + + SOCKS &Version: + + + Qt::PlainText + + + socksVersion + + + + + + + SOCKS version of the proxy (e.g. 5) + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Connect through &Tor: + + + + + + + + + + 60 + 0 + + + + Tor IP: + + + + + + + + 115 + 16777215 + + + + + + + + Port: + + + + + + + + 55 + 16777215 + + + + + + + + Use Tor only + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Tor name: + + + Qt::PlainText + + + torName + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Seeder command: + + + + + + + + + + Choose ... + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + &Window + + + + + + Show only a tray icon after minimizing the window. + + + &Minimize to the tray instead of the taskbar + + + + + + + Minimize instead of exit the application when the window is closed. When this option is enabled, the application will be closed only after selecting Exit in the menu. + + + M&inimize on close + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + &Display + + + + + + + + User Interface &language: + + + Qt::PlainText + + + lang + + + + + + + The user interface language can be set here. This setting will take effect after restarting NovaCoin. + + + + + + + + + + + &Unit to show amounts in: + + + Qt::PlainText + + + unit + + + + + + + Choose the default subdivision unit to show in the interface and when sending coins. + + + + + + + + + Whether to show NovaCoin addresses in the transaction list or not. + + + &Display addresses in transaction list + + + + + + + Whether to show coin control features or not. + + + Display coin &control features (experts only!) + + + + + + + + + Third party URLs (e.g. explorer.novaco.in) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |. + + + Third party transaction URLs + + + thirdPartyTxUrls + + + + + + + Third party URLs (e.g. explorer.novaco.in) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |. + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 48 + + + + + + + + + 75 + true + + + + + + + Qt::PlainText + + + true + + + + + + + Qt::Horizontal + + + + 40 + 48 + + + + + + + + &OK + + + + + + + &Cancel + + + false + + + + + + + &Apply + + + false + + + + + + + + + + BitcoinAmountField + QSpinBox +
bitcoinamountfield.h
+ + + QValueComboBox + QComboBox +
qvaluecombobox.h
+ + + QValidatedLineEdit + QLineEdit +
qvalidatedlineedit.h
+ + + + + diff --git a/src/qt/overviewpage.ui b/src/qt/overviewpage.ui new file mode 100644 index 0000000..ae2a04b --- /dev/null +++ b/src/qt/overviewpage.ui @@ -0,0 +1,434 @@ + + + OverviewPage + + + + 0 + 0 + 573 + 342 + + + + Form + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + + 75 + true + + + + Balances + + + + + + + The displayed information may be out of date. Your wallet automatically synchronizes with the NovaCoin network after a connection is established, but this process has not completed yet. + + + QLabel { color: red; } + + + (out of sync) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + 12 + + + 12 + + + + + Your current available balance + + + Available: + + + + + + + + 75 + true + + + + IBeamCursor + + + Your current available balance + + + 0 NVC + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Total of coins that was staked, and do not yet count toward the current balance + + + Stake: + + + + + + + + 75 + true + + + + IBeamCursor + + + Total of coins that was staked, and do not yet count toward the current balance + + + 0 NVC + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Total of transactions that have yet to be confirmed, and do not yet count toward the current balance + + + Unconfirmed: + + + + + + + + 75 + true + + + + IBeamCursor + + + Total of transactions that have yet to be confirmed, and do not yet count toward the current balance + + + 0 NVC + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Mined balance that has not yet matured + + + Immature: + + + + + + + + 75 + true + + + + Mined balance that has not yet matured + + + 0 NVC + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Your unspendable balance + + + Unspendable: + + + + + + + + 75 + true + + + + IBeamCursor + + + Your unspendable balance + + + 0 NVC + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + 230 + 16777215 + + + + Qt::Horizontal + + + + + + + Your current total balance + + + Total: + + + + + + + + 75 + true + + + + Your current total balance + + + 0 NVC + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Total number of transactions in wallet + + + Number of transactions: + + + + + + + Total number of transactions in wallet + + + 0 + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + + <b>Recent transactions</b> + + + + + + + The displayed information may be out of date. Your wallet automatically synchronizes with the NovaCoin network after a connection is established, but this process has not completed yet. + + + QLabel { color: red; } + + + (out of sync) + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + QListView { background: transparent; } + + + QFrame::NoFrame + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + + + QAbstractItemView::NoSelection + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + diff --git a/src/qt/qrcodedialog.ui b/src/qt/qrcodedialog.ui new file mode 100644 index 0000000..52e9db3 --- /dev/null +++ b/src/qt/qrcodedialog.ui @@ -0,0 +1,212 @@ + + + QRCodeDialog + + + + 0 + 0 + 340 + 530 + + + + QR Code Dialog + + + + + + + 0 + 0 + + + + + 300 + 300 + + + + Qt::PlainText + + + Qt::AlignCenter + + + true + + + + + + + + 0 + 0 + + + + + 0 + 50 + + + + true + + + Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + + true + + + Request Payment + + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Label: + + + Qt::PlainText + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + lnLabel + + + + + + + + + + Message: + + + Qt::PlainText + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + lnMessage + + + + + + + + + + + 0 + 0 + + + + Amount: + + + Qt::PlainText + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + lnReqAmount + + + + + + + false + + + + 80 + 0 + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + &Save As... + + + + + + + + + + + + + BitcoinAmountField + QSpinBox +
bitcoinamountfield.h
+ + + + + + chkReqPayment + clicked(bool) + lnReqAmount + setEnabled(bool) + + + 92 + 285 + + + 98 + 311 + + + + + diff --git a/src/qt/qtipcserver.cpp b/src/qt/qtipcserver.cpp index 5ce78e1..ed4a38f 100644 --- a/src/qt/qtipcserver.cpp +++ b/src/qt/qtipcserver.cpp @@ -10,7 +10,7 @@ #include "qtipcserver.h" #include "guiconstants.h" -#include "ui_interface.h" +#include "interface.h" #include "util.h" #include diff --git a/src/qt/res/bitcoin-qt.rc b/src/qt/res/bitcoin-qt.rc index 96702fc..aaafa3d 100644 --- a/src/qt/res/bitcoin-qt.rc +++ b/src/qt/res/bitcoin-qt.rc @@ -1,7 +1,7 @@ -IDI_ICON1 ICON DISCARDABLE "icons/novacoin.ico" +IDI_ICON1 ICON DISCARDABLE "${CMAKE_CURRENT_SOURCE_DIR}/src/qt/res/icons/novacoin.ico" #include // needed for VERSIONINFO -#include "../../clientversion.h" // holds the needed client version information +#include "${CMAKE_CURRENT_SOURCE_DIR}/src/clientversion.h" // holds the needed client version information #define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) diff --git a/src/qt/rpcconsole.ui b/src/qt/rpcconsole.ui new file mode 100644 index 0000000..97390ea --- /dev/null +++ b/src/qt/rpcconsole.ui @@ -0,0 +1,786 @@ + + + RPCConsole + + + + 0 + 0 + 740 + 450 + + + + NovaCoin - Debug window + + + + + + 0 + + + + &Information + + + + + + + 75 + true + + + + Configuration file + + + + + + + IBeamCursor + + + N/A + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Current number of blocks + + + + + + + IBeamCursor + + + N/A + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + 75 + true + + + + Command-line options + + + + + + + Open the NovaCoin debug log file from the current data directory. This can take a few seconds for large log files. + + + &Open + + + false + + + + + + + + 75 + true + + + + Debug log file + + + + + + + Qt::Horizontal + + + + 404 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Show the NovaCoin-Qt help message to get a list with possible NovaCoin command-line options. + + + &Show + + + false + + + + + + + Last block time + + + + + + + + 75 + true + + + + Network + + + + + + + IBeamCursor + + + N/A + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Startup time + + + + + + + On testnet + + + + + + + IBeamCursor + + + N/A + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Number of connections + + + + + + + + 75 + true + + + + Block chain + + + + + + + false + + + + + + + + + + Estimated total blocks + + + + + + + IBeamCursor + + + N/A + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + IBeamCursor + + + N/A + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Using BerkeleyDB version + + + 10 + + + + + + + Using OpenSSL version + + + 10 + + + + + + + IBeamCursor + + + N/A + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + IBeamCursor + + + N/A + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Build date + + + + + + + IBeamCursor + + + N/A + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Client version + + + + + + + + 75 + true + + + + NovaCoin Core + + + + + + + IBeamCursor + + + N/A + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Client name + + + + + + + Qt::Vertical + + + + 20 + 20 + + + + + + + + Open the NovaCoin configuration file from the current data directory. + + + O&pen + + + false + + + + + + + + &Console + + + + 3 + + + + + + 0 + 100 + + + + true + + + false + + + 2 + + + + + + + 3 + + + + + > + + + + + + + false + + + + + + + + 24 + 24 + + + + Clear console + + + + + + + :/icons/remove:/icons/remove + + + Ctrl+L + + + false + + + + + + + + + + &Network Traffic + + + + + + + + + 0 + 0 + + + + + + + + + + 1 + + + 288 + + + 12 + + + 6 + + + Qt::Horizontal + + + + + + + + 100 + 0 + + + + Qt::AlignCenter + + + + + + + &Clear + + + false + + + + + + + + + + + + + Totals + + + + + + + + + 0 + 0 + + + + + 10 + 0 + + + + + + + + + 0 + 255 + 0 + + + + + + + + + 0 + 255 + 0 + + + + + + + + + 0 + 255 + 0 + + + + + + + + Qt::Horizontal + + + + + + + Received: + + + + + + + + 50 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + 0 + 0 + + + + + 10 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + Qt::Horizontal + + + + + + + Sent: + + + + + + + + 50 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + Qt::Vertical + + + + 20 + 407 + + + + + + + + + + + + + + + + + + TrafficGraphWidget + QWidget +
trafficgraphwidget.h
+ 1 + + clear() + + + + + + + + diff --git a/src/qt/secondauthdialog.ui b/src/qt/secondauthdialog.ui new file mode 100644 index 0000000..7d529fc --- /dev/null +++ b/src/qt/secondauthdialog.ui @@ -0,0 +1,230 @@ + + + SecondAuthDialog + + + Qt::ApplicationModal + + + + 0 + 0 + 768 + 221 + + + + Second Authentification + + + + + + You can sign hash of transaction exists in the blockchain with your addresses. + + + Qt::PlainText + + + true + + + + + + + + + The address for authentification (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5) + + + 34 + + + + + + + Choose an address from the address book + + + + + + + :/icons/address-book:/icons/address-book + + + Alt+A + + + false + + + + + + + + + + + 64 + + + + + + + Paste hash from clipboard + + + + + + + :/icons/editpaste:/icons/editpaste + + + Alt+P + + + false + + + + + + + + + 6 + + + + + + true + + + + true + + + + + + + Copy the current signature to the system clipboard + + + + + + + :/icons/editcopy:/icons/editcopy + + + Alt+C + + + false + + + + + + + + + + + Sign the hash + + + &Sign Data + + + + :/icons/edit:/icons/edit + + + false + + + + + + + Reset all sign message fields + + + Clear &All + + + + :/icons/remove:/icons/remove + + + false + + + + + + + Qt::Horizontal + + + + 10 + 48 + + + + + + + + + 75 + true + + + + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 48 + + + + + + + + + + + QValidatedLineEdit + QLineEdit +
qvalidatedlineedit.h
+ + + + + + + diff --git a/src/qt/sendcoinsdialog.ui b/src/qt/sendcoinsdialog.ui new file mode 100644 index 0000000..a87171c --- /dev/null +++ b/src/qt/sendcoinsdialog.ui @@ -0,0 +1,794 @@ + + + SendCoinsDialog + + + + 0 + 0 + 850 + 400 + + + + Send Coins + + + + 8 + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + -1 + + + 0 + + + 0 + + + 0 + + + 6 + + + + + 0 + + + 10 + + + 10 + + + + + 15 + + + + + + 0 + 0 + + + + + 75 + true + + + + font-weight:bold; + + + Coin Control Features + + + + + + + + + 8 + + + 10 + + + + + + + + Inputs... + + + + + + + automatically selected + + + 5 + + + + + + + + 75 + true + + + + color:red;font-weight:bold; + + + Insufficient funds! + + + 5 + + + + + + + Qt::Horizontal + + + + 40 + 1 + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + + + + 0 + + + + + 20 + + + 0 + + + 10 + + + + + 10 + + + 14 + + + 10 + + + 4 + + + 6 + + + + + font-weight:bold; + + + Quantity: + + + 0 + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0 + + + 0 + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + font-weight:bold; + + + Bytes: + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0 + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + 10 + + + 14 + + + 6 + + + 4 + + + 6 + + + + + font-weight:bold; + + + Amount: + + + 0 + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0.00 NVC + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + font-weight:bold; + + + Priority: + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + medium + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + 10 + + + 14 + + + 6 + + + 4 + + + 6 + + + + + font-weight:bold; + + + Fee: + + + 0 + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0.00 NVC + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + font-weight:bold; + + + Low Output: + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + no + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + 10 + + + 14 + + + 6 + + + 4 + + + 6 + + + + + font-weight:bold; + + + After Fee: + + + 0 + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0.00 NVC + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + font-weight:bold; + + + Change + + + + + + + + Monospace + 10 + + + + IBeamCursor + + + Qt::ActionsContextMenu + + + 0.00 NVC + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + + + + + + 12 + + + QLayout::SetDefaultConstraint + + + 5 + + + 5 + + + + + custom change address + + + + + + + false + + + + 0 + 0 + + + + + + + + false + + + Choose address from address book + + + + + + + :/icons/address-book:/icons/address-book + + + Alt+A + + + + + + + false + + + Paste address from clipboard + + + + + + + :/icons/editpaste:/icons/editpaste + + + Alt+P + + + + + + + + + Qt::Vertical + + + + 800 + 1 + + + + + + + + + + + + + true + + + + + 0 + 0 + 830 + 165 + + + + + 0 + + + + + 6 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + Send to multiple recipients at once + + + Add &Recipient + + + + :/icons/add:/icons/add + + + false + + + + + + + + 0 + 0 + + + + Remove all transaction fields + + + Clear &All + + + + :/icons/remove:/icons/remove + + + 300 + + + false + + + + + + + 3 + + + + + Balance: + + + + + + + IBeamCursor + + + 123.456 NVC + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 150 + 0 + + + + Confirm the send action + + + S&end + + + + :/icons/send:/icons/send + + + true + + + + + + + + + + + + diff --git a/src/qt/sendcoinsentry.ui b/src/qt/sendcoinsentry.ui new file mode 100644 index 0000000..bdbffb1 --- /dev/null +++ b/src/qt/sendcoinsentry.ui @@ -0,0 +1,169 @@ + + + SendCoinsEntry + + + + 0 + 0 + 729 + 136 + + + + Form + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + 12 + + + + + A&mount: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + payAmount + + + + + + + Pay &To: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + payTo + + + + + + + + + + 0 + + + + + true + + + Enter a label for this address to add it to your address book + + + + + + + + + &Label: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + addAsLabel + + + + + + + 0 + + + + + The address to send the payment to (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5) + + + 100 + + + + + + + Choose address from address book + + + + + + + :/icons/address-book:/icons/address-book + + + Alt+A + + + + + + + Paste address from clipboard + + + + + + + :/icons/editpaste:/icons/editpaste + + + Alt+P + + + + + + + Remove this recipient + + + + + + + :/icons/remove:/icons/remove + + + + + + + + + + QValidatedLineEdit + QWidget +
qvalidatedlineedit.h
+ + + BitcoinAmountField + QLineEdit +
bitcoinamountfield.h
+ 1 + + + + + + + diff --git a/src/qt/signverifymessagedialog.ui b/src/qt/signverifymessagedialog.ui new file mode 100644 index 0000000..19ce198 --- /dev/null +++ b/src/qt/signverifymessagedialog.ui @@ -0,0 +1,386 @@ + + + SignVerifyMessageDialog + + + Qt::ApplicationModal + + + + 0 + 0 + 700 + 380 + + + + Signatures - Sign / Verify a Message + + + + + + 1 + + + + &Sign Message + + + + + + You can sign messages with your addresses to prove you own them. Be careful not to sign anything vague, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to. + + + Qt::PlainText + + + true + + + + + + + 0 + + + + + The address to sign the message with (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5) + + + 34 + + + + + + + Choose an address from the address book + + + + + + + :/icons/address-book:/icons/address-book + + + Alt+A + + + false + + + + + + + Paste address from clipboard + + + + + + + :/icons/editpaste:/icons/editpaste + + + Alt+P + + + false + + + + + + + + + Enter the message you want to sign here + + + + + + + 0 + + + + + + true + + + + true + + + + + + + Copy the current signature to the system clipboard + + + + + + + :/icons/editcopy:/icons/editcopy + + + false + + + + + + + + + + + Sign the message to prove you own this NovaCoin address + + + &Sign Message + + + + :/icons/edit:/icons/edit + + + false + + + + + + + Reset all sign message fields + + + Clear &All + + + + :/icons/remove:/icons/remove + + + false + + + + + + + Qt::Horizontal + + + + 40 + 48 + + + + + + + + + 75 + true + + + + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 48 + + + + + + + + + + + &Verify Message + + + + + + Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack. + + + Qt::PlainText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + 0 + + + + + The address the message was signed with (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5) + + + 34 + + + + + + + Choose an address from the address book + + + + + + + :/icons/address-book:/icons/address-book + + + Alt+A + + + false + + + + + + + + + + + + + + + + + Verify the message to ensure it was signed with the specified NovaCoin address + + + &Verify Message + + + + :/icons/transaction_0:/icons/transaction_0 + + + false + + + + + + + Reset all verify message fields + + + Clear &All + + + + :/icons/remove:/icons/remove + + + false + + + + + + + Qt::Horizontal + + + + 40 + 48 + + + + + + + + + 75 + true + + + + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 48 + + + + + + + + + + + + + + + QValidatedLineEdit + QLineEdit +
qvalidatedlineedit.h
+ + + + + + + diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp deleted file mode 100644 index af2d358..0000000 --- a/src/qt/test/test_main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include - -#include "uritests.h" - -// This is all you need to run all the tests -int main(int argc, char *argv[]) -{ - bool fInvalid = false; - - URITests test1; - if (QTest::qExec(&test1) != 0) - fInvalid = true; - - return fInvalid; -} diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp deleted file mode 100644 index 4662f5e..0000000 --- a/src/qt/test/uritests.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include "uritests.h" -#include "../guiutil.h" -#include "../walletmodel.h" - -#include - -/* -struct SendCoinsRecipient -{ - QString address; - QString label; - qint64 amount; -}; -*/ - -void URITests::uriTests() -{ - SendCoinsRecipient rv; - QUrl uri; - uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-dontexist=")); - QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv)); - - uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?dontexist=")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); - QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); - QVERIFY(rv.label == QString()); - QVERIFY(rv.amount == 0); - - uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?label=Wikipedia Example Address")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); - QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); - QVERIFY(rv.label == QString("Wikipedia Example Address")); - QVERIFY(rv.amount == 0); - - uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=0.001")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); - QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); - QVERIFY(rv.label == QString()); - QVERIFY(rv.amount == 100000); - - uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1.001")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); - QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); - QVERIFY(rv.label == QString()); - QVERIFY(rv.amount == 100100000); - - uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=100&label=Wikipedia Example")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); - QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); - QVERIFY(rv.amount == 10000000000LL); - QVERIFY(rv.label == QString("Wikipedia Example")); - - uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address")); - QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); - QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); - QVERIFY(rv.label == QString()); - - QVERIFY(GUIUtil::parseBitcoinURI("bitcoin://175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address", &rv)); - QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); - QVERIFY(rv.label == QString()); - - // We currently don't implement the message parameter (ok, yea, we break spec...) - uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-message=Wikipedia Example Address")); - QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv)); - - uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000&label=Wikipedia Example")); - QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv)); - - uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000.0&label=Wikipedia Example")); - QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv)); -} diff --git a/src/qt/test/uritests.h b/src/qt/test/uritests.h deleted file mode 100644 index 1237516..0000000 --- a/src/qt/test/uritests.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef URITESTS_H -#define URITESTS_H - -#include -#include - -class URITests : public QObject -{ - Q_OBJECT - -private slots: - void uriTests(); -}; - -#endif // URITESTS_H diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index 72bc460..742de00 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -6,7 +6,7 @@ #include "main.h" #include "wallet.h" #include "txdb.h" -#include "ui_interface.h" +#include "interface.h" #include "base58.h" #include diff --git a/src/qt/transactiondescdialog.ui b/src/qt/transactiondescdialog.ui new file mode 100644 index 0000000..dd78c38 --- /dev/null +++ b/src/qt/transactiondescdialog.ui @@ -0,0 +1,74 @@ + + + TransactionDescDialog + + + + 0 + 0 + 620 + 250 + + + + Transaction details + + + + + + This pane shows a detailed description of the transaction + + + true + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Close + + + + + + + + + buttonBox + accepted() + TransactionDescDialog + close() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + TransactionDescDialog + close() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index ee4742a..a2f2d66 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -9,7 +9,7 @@ #include "bitcoinunits.h" #include "wallet.h" -#include "ui_interface.h" +#include "interface.h" #include #include diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index faf5049..70a2815 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -5,7 +5,7 @@ #include "mintingtablemodel.h" #include "transactiontablemodel.h" -#include "ui_interface.h" +#include "interface.h" #include "wallet.h" #include "walletdb.h" // for BackupWallet #include "base58.h" diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp index 01ebf94..44615a1 100644 --- a/src/rpcdump.cpp +++ b/src/rpcdump.cpp @@ -4,7 +4,7 @@ #include "init.h" // for pwalletMain #include "bitcoinrpc.h" -#include "ui_interface.h" +#include "interface.h" #include "base58.h" #define printf OutputDebugStringF diff --git a/src/ui_interface.h b/src/ui_interface.h deleted file mode 100644 index d62e64b..0000000 --- a/src/ui_interface.h +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright (c) 2010 Satoshi Nakamoto -// Copyright (c) 2012 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_UI_INTERFACE_H -#define BITCOIN_UI_INTERFACE_H - -#include -#include -#include - -#include "util.h" - -class CBasicKeyStore; -class CWallet; -class uint256; - -/** General change type (added, updated, removed). */ -enum ChangeType -{ - CT_NEW, - CT_UPDATED, - CT_DELETED -}; - -/** Signals for UI communication. */ -class CClientUIInterface -{ -public: - /** Flags for CClientUIInterface::ThreadSafeMessageBox */ - enum MessageBoxFlags - { - YES = 0x00000002, - OK = 0x00000004, - NO = 0x00000008, - YES_NO = (YES|NO), - CANCEL = 0x00000010, - APPLY = 0x00000020, - CLOSE = 0x00000040, - OK_DEFAULT = 0x00000000, - YES_DEFAULT = 0x00000000, - NO_DEFAULT = 0x00000080, - CANCEL_DEFAULT = 0x80000000, - ICON_EXCLAMATION = 0x00000100, - ICON_HAND = 0x00000200, - ICON_WARNING = ICON_EXCLAMATION, - ICON_ERROR = ICON_HAND, - ICON_QUESTION = 0x00000400, - ICON_INFORMATION = 0x00000800, - ICON_STOP = ICON_HAND, - ICON_ASTERISK = ICON_INFORMATION, - ICON_MASK = (0x00000100|0x00000200|0x00000400|0x00000800), - FORWARD = 0x00001000, - BACKWARD = 0x00002000, - RESET = 0x00004000, - HELP = 0x00008000, - MORE = 0x00010000, - SETUP = 0x00020000, - // Force blocking, modal message box dialog (not just OS notification) - MODAL = 0x00040000, - - /** Predefined combinations for certain default usage cases */ - MSG_INFORMATION = ICON_INFORMATION, - MSG_WARNING = (ICON_WARNING | OK | MODAL), - MSG_ERROR = (ICON_ERROR | OK | MODAL) - - }; - - /** Show message box. */ - boost::signals2::signal ThreadSafeMessageBox; - - /** Ask the user whether they want to pay a fee or not. */ - boost::signals2::signal > ThreadSafeAskFee; - - /** Handle a URL passed at the command line. */ - boost::signals2::signal ThreadSafeHandleURI; - - /** Progress message during initialization. */ - boost::signals2::signal InitMessage; - - /** Initiate client shutdown. */ - boost::signals2::signal QueueShutdown; - - /** Translate a message to the native language of the user. */ - boost::signals2::signal Translate; - - /** Block chain changed. */ - boost::signals2::signal NotifyBlocksChanged; - - /** Number of network connections changed. */ - boost::signals2::signal NotifyNumConnectionsChanged; - - /** - * New, updated or cancelled alert. - * @note called with lock cs_mapAlerts held. - */ - boost::signals2::signal NotifyAlertChanged; -}; - -extern CClientUIInterface uiInterface; - -/** - * Translation function: Call Translate signal on UI interface, which returns a boost::optional result. - * If no translation slot is registered, nothing is returned, and simply return the input. - */ -inline std::string _(const char* psz) -{ - boost::optional rv = uiInterface.Translate(psz); - return rv ? (*rv) : psz; -} - -#endif diff --git a/src/util.cpp b/src/util.cpp index 641b07f..393d8e8 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -6,7 +6,7 @@ #include "util.h" #include "sync.h" #include "version.h" -#include "ui_interface.h" +#include "interface.h" #include #include // for to_lower() #include // for startswith() and endswith() diff --git a/src/wallet.cpp b/src/wallet.cpp index f94240b..4abe450 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -7,7 +7,7 @@ #include "wallet.h" #include "walletdb.h" #include "crypter.h" -#include "ui_interface.h" +#include "interface.h" #include "base58.h" #include "kernel.h" #include "coincontrol.h" diff --git a/src/wallet.h b/src/wallet.h index 4925025..44c848a 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -14,7 +14,7 @@ #include "key.h" #include "keystore.h" #include "script.h" -#include "ui_interface.h" +#include "interface.h" #include "util.h" #include "walletdb.h" #include "base58.h" -- 1.7.1