build

Author: sinev-valentine

.gitignore

@@ -14,7 +14,7 @@
 /key_data/*
 /keychain_cmd_app/.idea/*
 /keychain_lib/CMakeFiles/*
-/passentry_gui/cmake-build-debug/*
+/keychain_linux/passentry_gui/cmake-build-debug/*
 /passentry_gui/.idea/*
 /ws/cmake-build-debug/*
 /ws/.idea/*

keychain_linux/passentry_gui/CMakeLists.txt

@@ -3,41 +3,72 @@ set(CMAKE_CXX_STANDARD 14)
 #set(CMAKE_CXX_FLAGS "-std=c++14 --verbose -fno-limit-debug-info")
 set(CMAKE_CXX_FLAGS "-std=c++14 ")
 
+project(testproject)
+
+
 if (NOT MSVC)
     if ( LIBCXX_BUILD )
         set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -stdlib=libc++" )
     endif()
 endif()
 
-set (CMAKE_PREFIX_PATH "${QT_ROOT}/gcc_64/lib/cmake/Qt5Widgets/")
+#set (CMAKE_PREFIX_PATH "${QT_ROOT}/gcc_64/lib/cmake/Qt5Widgets/")
+set (CMAKE_PREFIX_PATH "/home/user/Qt5.12.0/5.12.0/gcc_64/lib/cmake/Qt5Widgets")
 
 project(passentrygui)
 # Find includes in corresponding build directories
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-# Instruct CMake to run moc automatically when needed
+
+#set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_SOURCE_DIR}/keychain_linux/passentry_gui/src")
+#set(AUTOGEN_BUILD_DIR "${CMAKE_SOURCE_DIR}/keychain_linux/passentry_gui/GeneratedFiles")
+
 set(CMAKE_AUTOMOC ON)
-# Create code from a list of Qt designer ui files
-#set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOUIC ON)
+#set(CMAKE_AUTORCC ON)
+
+SET(Qt5_DIR /home/user/Qt5.12.0/5.12.0/gcc_64/lib/cmake/Qt5)
+SET(Qt5Core_DIR /home/user/Qt5.12.0/5.12.0/gcc_64/lib/cmake/Qt5Core)
+
+find_package(Qt5Widgets CONFIG REQUIRED)
+find_package(Qt5Core)
+#find_package(Qt5 5.12.0 REQUIRED Gui Xml)
 
+#find_package(Qt5Qml  )
+#find_package(Qt5Svg)
+
+#get_target_property(QtCore_location Qt5::Core LOCATION)
+
+#add_definitions(-DUNICODE -D_UNICODE)
+
+#qt5_add_resources(RESOURCES "${CMAKE_SOURCE_DIR}/keychain_linux/passentry_gui/Resources/*.qrc")
+#QT5_WRAP_UI(MOC_FILES "${CMAKE_SOURCE_DIR}/keychain_linux/passentry_gui/src/*.ui")
+#include_directories(${Qt5Widgets_INCLUDES})
+#include_directories(${Qt5Core_INCLUDES})
+#include_directories(${Qt5Qml_INCLUDES})
+#include_directories(${Qt5Svg_INCLUDES})
+#add_definitions(${Qt5Widgets_DEFINITIONS})
 
 find_library(LIB_PTHREAD NAME pthread HINTS "/usr/lib/x86_64-linux-gnu")
 
 SET(BOOST_COMPONENTS)
-LIST(APPEND BOOST_COMPONENTS date_time system filesystem program_options serialization chrono unit_test_framework locale iostreams)
+LIST(APPEND BOOST_COMPONENTS log date_time system filesystem program_options  serialization chrono  locale thread exception iostreams)
 SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
 
+#SET(BOOST_ROOT $ENV{BOOST_ROOT})
 set(Boost_USE_MULTITHREADED ON)
 set(BOOST_ALL_DYN_LINK OFF)
 
 FIND_PACKAGE(Boost 1.65 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 SET(Boost_LIBRARIES ${Boost_LIBRARIES})
 
-include_directories(
-        "include"
-        "../../keychain_lib/include"
-        "../../libraries/kaitai_struct_cpp_stl_runtime"
-        "../../libraries/fc_light/include"
+
+include_directories("${CMAKE_SOURCE_DIR}/keychain_linux/passentry_gui/include"
+#        "${AUTOGEN_BUILD_DIR}"
+        "${CMAKE_SOURCE_DIR}/libraries/fc_light/include"
+        "${CMAKE_SOURCE_DIR}/keychain_lib/include"
+        "${CMAKE_SOURCE_DIR}/libraries/kaitai_struct_cpp_stl_runtime"
+        ${Boost_INCLUDE_DIR}
         "/usr/include/libcxxabi"
         "${OPENSSL_ROOT_DIR}/include"
         ${Boost_INCLUDE_DIR})
@@ -46,12 +77,13 @@ include_directories(
 find_package(Qt5Widgets CONFIG REQUIRED)
 find_library(LIB_OPENSSL NAME crypto  HINTS "${OPENSSL_ROOT_DIR}/lib")
 
-file(GLOB GUI_SOURCES "./src/*.cpp")
-file(GLOB GUI_INCLUDE "./include/*.hpp")
-
-add_executable(passentry_gui ${GUI_SOURCES} ${GUI_INCLUDE})
+file(GLOB GUI_SOURCES "${CMAKE_SOURCE_DIR}/keychain_linux/passentry_gui/src/*.cpp")
+file(GLOB GUI_INCLUDE "${CMAKE_SOURCE_DIR}/keychain_linux/passentry_gui/include/*.h*")
+file(GLOB GUI_RESOURCES "./Resources/*.qrc")
+file(GLOB GUI_UIS "./src/*.ui")
 
+add_executable(passentry_gui ${GUI_SOURCES} ${GUI_INCLUDE} ${GUI_RESOURCES} ${GUI_UIS} )
 
 # Use the Widgets module from Qt 5
-target_link_libraries(passentry_gui Qt5::Widgets fc_light ${LIB_PTHREAD} ${LIB_OPENSSL} ${Boost_LIBRARIES} )
-
+#target_link_libraries(passentry_gui Qt5::Widgets Qt5::Core Qt5::Qml Qt5::Svg keychain_common secmodlib kaitai_struct_cpp_stl_runtime fc_light ${LIB_PTHREAD} ${LIB_OPENSSL} ${Boost_LIBRARIES} )
+target_link_libraries(passentry_gui Qt5::Widgets Qt5::Core   keychain_common  kaitai_struct_cpp_stl_runtime fc_light ${LIB_PTHREAD} ${LIB_OPENSSL} ${Boost_LIBRARIES} )

keychain_linux/passentry_gui/src/SecureWindowElement.ui renamed to keychain_linux/passentry_gui/include/SecureWindowElement.ui

@@ -1,3 +1,5 @@
+#include "keychain_gui_win.h"
+
 #include "widget.hpp"
 #include <QApplication>
 #include <QDesktopWidget>
@@ -9,7 +11,12 @@ Q_DECLARE_METATYPE(std::string)
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-    Widget w;
+//    Widget w;
+
+    QString srcTrans;
+    Transaction trans(srcTrans);
+
+    keychain_gui_win w(trans);
 
     const QRect sz = QApplication::desktop()->availableGeometry(&w);
     w.resize(sz.width() / 6, sz.height() * 1 / 6);
@@ -22,4 +29,3 @@ int main(int argc, char *argv[])
 
 
 
-