[WIP] QtQuick GUI

.gitignore

@@ -127,3 +127,13 @@ generated_proto/
 terminal.*/
 BlockSettleHW/ledger/hidapi/*
 GUI/QtWidgets/ui/*
+
+*.autosave
+
+# dvajdual test environment
+GUI/QtQuick/main.cpp
+GUI/QtQuick/qml/main_test.qml
+GUI/QtQuick/qml.qrc
+GUI/QtQuick/qml_test.pro
+GUI/QtQuick/qml_test.pro.user
+

.vscode/settings.json

@@ -0,0 +1,75 @@
+{
+  "files.associations": {
+    "map": "cpp",
+    "iosfwd": "cpp",
+    "xlocbuf": "cpp",
+    "ios": "cpp",
+    "type_traits": "cpp",
+    "xstring": "cpp",
+    "xutility": "cpp",
+    "array": "cpp",
+    "atomic": "cpp",
+    "bit": "cpp",
+    "*.tcc": "cpp",
+    "bitset": "cpp",
+    "cctype": "cpp",
+    "chrono": "cpp",
+    "cinttypes": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "compare": "cpp",
+    "concepts": "cpp",
+    "condition_variable": "cpp",
+    "csignal": "cpp",
+    "cstdarg": "cpp",
+    "cstddef": "cpp",
+    "cstdint": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cstring": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "cwctype": "cpp",
+    "deque": "cpp",
+    "list": "cpp",
+    "set": "cpp",
+    "string": "cpp",
+    "unordered_map": "cpp",
+    "unordered_set": "cpp",
+    "vector": "cpp",
+    "exception": "cpp",
+    "algorithm": "cpp",
+    "functional": "cpp",
+    "iterator": "cpp",
+    "memory": "cpp",
+    "memory_resource": "cpp",
+    "numeric": "cpp",
+    "optional": "cpp",
+    "random": "cpp",
+    "ratio": "cpp",
+    "regex": "cpp",
+    "string_view": "cpp",
+    "system_error": "cpp",
+    "tuple": "cpp",
+    "utility": "cpp",
+    "fstream": "cpp",
+    "future": "cpp",
+    "initializer_list": "cpp",
+    "iomanip": "cpp",
+    "iostream": "cpp",
+    "istream": "cpp",
+    "limits": "cpp",
+    "mutex": "cpp",
+    "new": "cpp",
+    "numbers": "cpp",
+    "ostream": "cpp",
+    "semaphore": "cpp",
+    "sstream": "cpp",
+    "stdexcept": "cpp",
+    "stop_token": "cpp",
+    "streambuf": "cpp",
+    "thread": "cpp",
+    "typeinfo": "cpp",
+    "variant": "cpp"
+  }
+}

BlockSettleApp/CMakeLists.txt

@@ -19,12 +19,16 @@ INCLUDE_DIRECTORIES( ${BLOCKSETTLE_UI_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES( ${BS_NETWORK_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES( ${BS_COMMON_ENUMS_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES( ${BS_COMMUNICATION_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${BS_HW_LIB_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES( ${WALLET_LIB_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES( ${CRYPTO_LIB_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES( ${BOTAN_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES( ${Qt5Svg_INCLUDE_DIRS} )
 
 IF ( APPLE )
+    include(CodeSign)
+    include(Notarize)
+
     SET( BUNDLE_NAME "BlockSettle Terminal" )
 
     SET( MACOSX_BUNDLE_BUNDLE_NAME ${BUNDLE_NAME} )
@@ -40,18 +44,51 @@ IF ( APPLE )
     SET_SOURCE_FILES_PROPERTIES( ${BS_TERMINAL_ICNS_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     ADD_EXECUTABLE( ${BLOCKSETTLE_APP_NAME} MACOSX_BUNDLE ${SOURCES} ${HEADERS} ${BS_TERMINAL_ICNS_FILE})
     SET_TARGET_PROPERTIES( ${BLOCKSETTLE_APP_NAME} PROPERTIES OUTPUT_NAME "${BUNDLE_NAME}" )
+
+    code_sign_is_enabled(can_sign)
+    if (can_sign)
+        set(FILES_TO_SIGN "${EXECUTABLE_OUTPUT_PATH}/${BUNDLE_NAME}.app")
+        configure_file(../common/build_scripts/CMakeModules/CodeSignScript.cmake.in sign_app.cmake)
+        list(APPEND postpkg
+            COMMAND "${CMAKE_COMMAND}" -E echo "Code signing ${BUNDLE_NAME}.app"
+            COMMAND "${CMAKE_COMMAND}" -P "sign_app.cmake"
+        )
+        add_custom_target(sign
+            ${postpkg}
+            WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+            VERBATIM
+            USES_TERMINAL
+        )
+    endif ()
+
+ELSEIF(UNIX AND NOT APPLE)
+    ADD_EXECUTABLE( ${BLOCKSETTLE_APP_NAME} ${SOURCES} ${HEADERS} )
+    IF(BUILD_APPIMAGE)
+        configure_file(../common/build_scripts/CMakeModules/AppImageScript.cmake.in appimage.cmake)
+	ADD_CUSTOM_COMMAND(TARGET ${BLOCKSETTLE_APP_NAME} POST_BUILD
+            COMMAND "${CMAKE_COMMAND}" -E echo "Building ${BUNDLE_NAME}.AppImage"
+            COMMAND "${CMAKE_COMMAND}" -P "appimage.cmake"
+	)
+    ENDIF()
+
 ELSEIF ( WIN32 )
     ADD_EXECUTABLE( ${BLOCKSETTLE_APP_NAME} WIN32 ${SOURCES} ${HEADERS} blocksettle.rc )
+
 ELSE ()
     ADD_EXECUTABLE( ${BLOCKSETTLE_APP_NAME} ${SOURCES} ${HEADERS} )
+
 ENDIF ()
 
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath='$ORIGIN'")
+
 TARGET_LINK_LIBRARIES( ${BLOCKSETTLE_APP_NAME}
    ${TERMINAL_CORE_NAME}
+   ${BLOCKSETTLE_HW_LIBRARY_NAME}
    ${TERMINAL_GUI_QT_NAME}
    ${TERMINAL_GUI_QTQUICK_NAME}
    ${BLOCKSETTLE_UI_LIBRARY_NAME}
    ${BS_NETWORK_LIB_NAME}
+   ${CURL_LIB}
    ${CPP_WALLET_LIB_NAME}
    ${CRYPTO_LIB_NAME}
    ${BOTAN_LIB}

BlockSettleApp/macosapp.cpp

@@ -0,0 +1,26 @@
+#include <QEvent>
+#include <QApplicationStateChangeEvent>
+#include "macosapp.h"
+
+MacOsApp::MacOsApp(int &argc, char **argv) : QApplication(argc, argv) 
+{
+ // EMPTY CONSTRUCTOR
+}
+bool MacOsApp::event(QEvent* ev)
+{
+      if (ev->type() ==  QEvent::ApplicationStateChange) {
+         auto appStateEvent = static_cast<QApplicationStateChangeEvent*>(ev);
+
+         if (appStateEvent->applicationState() == Qt::ApplicationActive) {
+            if (activationRequired_) {
+               emit reactivateTerminal();
+            } else {
+               activationRequired_ = true;
+            }
+         } else {
+            activationRequired_ = false;
+         }
+      }
+
+      return QApplication::event(ev);
+   }

BlockSettleApp/macosapp.h

@@ -0,0 +1,26 @@
+#ifndef __MACOSAPP_H__
+#define __MACOSAPP_H__
+
+#include <QApplication>
+#include <QEvent>
+#include <QApplicationStateChangeEvent>
+
+class MacOsApp : public QApplication
+{
+   Q_OBJECT
+public:
+    using QApplication::QApplication;
+   MacOsApp(int &argc, char **argv); // : QApplication(argc, argv) {}
+//   ~MacOsApp() override = default;
+
+signals:
+   void reactivateTerminal();
+
+protected:
+   bool event(QEvent* ev) override;
+
+private:
+   bool activationRequired_ = false;
+};
+
+#endif

BlockSettleApp/main.cpp

@@ -29,13 +29,16 @@
 #include "ApiJson.h"
 #include "AssetsAdapter.h"
 #include "BsServerAdapter.h"
+#include "hwdevicemanager.h"
 #include "QtGuiAdapter.h"
 #include "QtQuickAdapter.h"
 #include "SettingsAdapter.h"
 #include "SignerAdapter.h"
 #include <spdlog/spdlog.h>
 #include <spdlog/sinks/daily_file_sink.h>
 
+#include "macosapp.h"
+
 //#include "AppNap.h"
 
 #ifdef USE_QWindowsIntegrationPlugin
@@ -61,16 +64,19 @@ Q_IMPORT_PLUGIN(QICOPlugin)
 Q_IMPORT_PLUGIN(QtQuick2PrivateWidgetsPlugin)
 #endif
 
+Q_IMPORT_PLUGIN(QtQmlPlugin)
 Q_IMPORT_PLUGIN(QtQuick2Plugin)
 Q_IMPORT_PLUGIN(QtQuick2WindowPlugin)
 Q_IMPORT_PLUGIN(QtQuickControls2Plugin)
+Q_IMPORT_PLUGIN(QtQuick2DialogsPlugin)
+Q_IMPORT_PLUGIN(QtQuick2DialogsPrivatePlugin)
 Q_IMPORT_PLUGIN(QtQuickTemplates2Plugin)
-//Q_IMPORT_PLUGIN(QtQuickControls1Plugin)
+Q_IMPORT_PLUGIN(QtQuickControls1Plugin)
 Q_IMPORT_PLUGIN(QtQuickLayoutsPlugin)
 Q_IMPORT_PLUGIN(QtQmlModelsPlugin)
 Q_IMPORT_PLUGIN(QmlFolderListModelPlugin)
 Q_IMPORT_PLUGIN(QmlSettingsPlugin)
-//Q_IMPORT_PLUGIN(QtLabsPlatformPlugin)
+Q_IMPORT_PLUGIN(QtLabsPlatformPlugin)
 #endif // STATIC_BUILD
 
 Q_DECLARE_METATYPE(ArmorySettings)
@@ -86,7 +92,7 @@ Q_DECLARE_METATYPE(UTXO)
 
 #include <QEvent>
 #include <QApplicationStateChangeEvent>
-
+/*
 class MacOsApp : public QApplication
 {
    Q_OBJECT
@@ -120,6 +126,7 @@ class MacOsApp : public QApplication
 private:
    bool activationRequired_ = false;
 };
+*/
 
 static void checkStyleSheet(QApplication &app)
 {
@@ -204,14 +211,16 @@ int main(int argc, char** argv)
       //inprocBus.addAdapter(std::make_shared<AssetsAdapter>(logMgr->logger()));
       inprocBus.addAdapterWithQueue(std::make_shared<WalletsAdapter>(logMgr->logger()
          , userWallets, signAdapter->createClient(), userBlockchain), "wallets");
+      inprocBus.addAdapterWithQueue(std::make_shared<bs::hww::DeviceManager>(
+         logMgr->logger()), "wallets");
       inprocBus.addAdapter(std::make_shared<BsServerAdapter>(logMgr->logger("bscon")));
       //inprocBus.addAdapter(std::make_shared<MatchingAdapter>(logMgr->logger("match")));
       //inprocBus.addAdapter(std::make_shared<SettlementAdapter>(logMgr->logger("settl")));
       //inprocBus.addAdapter(std::make_shared<MktDataAdapter>(logMgr->logger("md")));
       //inprocBus.addAdapter(std::make_shared<MDHistAdapter>(logMgr->logger("mdh")));
       //inprocBus.addAdapter(std::make_shared<ChatAdapter>(logMgr->logger("chat")));
       inprocBus.addAdapterWithQueue(std::make_shared<BlockchainAdapter>(logMgr->logger()
-         , userBlockchain), /*"blkchain_conn"*/"signer");
+         , userBlockchain), "signer");
 
       if (!inprocBus.run(argc, argv)) {
          logMgr->logger()->error("No runnable adapter found on main inproc bus");

BlockSettleHW/CMakeLists.txt

@@ -11,6 +11,7 @@
 PROJECT( ${BLOCKSETTLE_HW_LIBRARY_NAME} )
 
 SET(BLOCKSETTLE_HW_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
+ADD_DEFINITIONS(-DBUILD_HW_WALLETS)
 
 file(COPY ${THIRD_PARTY_COMMON_DIR}/hidapi/hidapi.h
     DESTINATION ${BLOCKSETTLE_HW_ROOT}/ledger/hidapi)
@@ -22,18 +23,22 @@ FILE(GLOB SOURCES
    trezor/*.cpp
    ledger/*.cpp
    ledger/hidapi/*.c
+   jade/*.cpp
 )
 
 FILE(GLOB HEADERS
    *.h
    trezor/*.h
    ledger/*.h
    ledger/hidapi/*.h
+   jade/*.h
 )
 
 INCLUDE_DIRECTORIES( ${WALLET_LIB_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES( ${BS_NETWORK_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES( ${COMMON_LIB_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES(${BLOCK_SETTLE_ROOT}/Core)
+INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR})
 
 if (UNIX)
     INCLUDE_DIRECTORIES( ${LIBUSB_INCLUDE_DIR} )
@@ -57,19 +62,13 @@ FUNCTION(GENERATE_PROTO IN_DIR OUT_DIR)
       SET(PROTO_SOURCE_FILES ${PROTO_SOURCE_FILES} ${PROTO_SOURCE_FILE})
       SET(PROTO_HEADER_FILES ${PROTO_HEADER_FILES} ${PROTO_HEADER_FILE})
 
-      ADD_CUSTOM_COMMAND(OUTPUT ${PROTO_SOURCE_FILE}
-                         OUTPUT ${PROTO_HEADER_FILE}
-                         DEPENDS ${PROTO_FILE}
-                         COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} ${PROTO_FILE} --cpp_out=${OUT_DIR} --proto_path=${IN_DIR}
-                         WORKING_DIRECTORY ${BLOCKSETTLE_HW_ROOT}
-      )
+      EXECUTE_PROCESS(COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} ${PROTO_FILE} --cpp_out ${OUT_DIR} -I ${IN_DIR} --proto_path ${IN_DIR})
    ENDFOREACH(PROTO_FILE)
 
    SET(GENERATED_SOURCE_FILES ${GENERATED_SOURCE_FILES} ${PROTO_SOURCE_FILES} PARENT_SCOPE)
    SET(GENERATED_HEADER_FILES ${GENERATED_HEADER_FILES} ${PROTO_HEADER_FILES} PARENT_SCOPE)
 
    SET(GENERATED_INCLUDE_DIRS ${GENERATED_INCLUDE_DIRS} ${OUT_DIR} PARENT_SCOPE)
-
 ENDFUNCTION(GENERATE_PROTO)
 
 GENERATE_PROTO("${THIRD_PARTY_COMMON_DIR}/trezorCommon" "${BLOCKSETTLE_HW_ROOT}/trezor/generated_proto")
@@ -84,7 +83,6 @@ TARGET_LINK_LIBRARIES(${BLOCKSETTLE_HW_LIBRARY_NAME}
    ${PROTO_LIB}
    Qt5::Core
    Qt5::Network
+   Qt5::SerialPort
    ${OS_SPECIFIC_LIBS}
 )
-
-