feat: improve the project structure

27 files changed, 35 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76547e65..d0628ae3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,7 @@ if (GPGFRONTEND_BUILD_TYPE_SDK)
     unset(GPGFRONTEND_BUILD_CONFIG)
 
     set(STABLE_BUILD_APPLICATION 0)
-    set(BUILD_SDK 1)
+    set(STABLE_BUILD_SDK_ONLY 1)
 endif()
 
 # C++
@@ -371,10 +371,12 @@ if (STABLE_BUILD_APPLICATION)
     set(BUILD_TEST 1)
     set(BUILD_APPLICATION 1)
     set(SUPPORT_MULTI_LANG 1)
-elseif (BUILD_SDK)
+    set(BUILD_SDK 1)
+elseif (STABLE_BUILD_SDK_ONLY)
     message("[+] Build SDK")
     set(BUILD_CORE 1)
     set(BUILD_MODULE 1)
+    set(BUILD_SDK 1)
 endif ()
 
 # For instance in order to select the highest version one
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d1f51efb..c23f0187 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -77,7 +77,7 @@ set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_AUTOUIC_SEARCH_PATHS} ${CMAKE_SOURCE_DIR}
 configure_file(${CMAKE_SOURCE_DIR}/src/GpgFrontend.h.in ${CMAKE_SOURCE_DIR}/src/GpgFrontend.h @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/src/GpgFrontendBuildInfo.h.in ${CMAKE_SOURCE_DIR}/src/GpgFrontendBuildInfo.h @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/src/GpgFrontendBuildInstallInfo.h.in ${CMAKE_SOURCE_DIR}/src/GpgFrontendBuildInstallInfo.h @ONLY)
-configure_file(${CMAKE_SOURCE_DIR}/src/module/sdk/GFSDKBuildInfo.h.in ${CMAKE_SOURCE_DIR}/src/module/sdk/GFSDKBuildInfo.h @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/src/sdk/GFSDKBuildInfo.h.in ${CMAKE_SOURCE_DIR}/src/sdk/GFSDKBuildInfo.h @ONLY)
 if (APPLE)
     configure_file(${CMAKE_SOURCE_DIR}/resource/plist/ExportOptions.plist.in ${CMAKE_BINARY_DIR}/ExportOptions.plist @ONLY)
 endif ()
@@ -114,7 +114,7 @@ endif ()
 
 if (BUILD_SDK)
     message("[+] Build SDK")
-    add_subdirectory(module)
+    add_subdirectory(sdk)
 endif ()
 
 # build to test gpgfrontend core
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index cedbe69a..000081d8 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -123,6 +123,11 @@ target_precompile_headers(gpgfrontend_core
 # using std c++ 17
 target_compile_features(gpgfrontend_core PUBLIC cxx_std_17)
 
+# lib output path
+set_target_properties(gpgfrontend_core PROPERTIES
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib)
+
 # link for different platforms
 if (MINGW)
     message(STATUS "Link GPG Static Library For MINGW")
diff --git a/src/core/module/Event.h b/src/core/module/Event.h
index b629caae..cb41c125 100644
--- a/src/core/module/Event.h
+++ b/src/core/module/Event.h
@@ -34,7 +34,7 @@
 
 #include "core/GpgFrontendCore.h"
 #include "core/model/DataObject.h"
-#include "module/sdk/GFSDKModule.h"
+#include "sdk/GFSDKModule.h"
 
 namespace GpgFrontend::Module {
 
diff --git a/src/core/module/Module.cpp b/src/core/module/Module.cpp
index 9c875fce..202f9d81 100644
--- a/src/core/module/Module.cpp
+++ b/src/core/module/Module.cpp
@@ -31,7 +31,7 @@
 #include "core/module/GlobalModuleContext.h"
 #include "core/utils/CommonUtils.h"
 #include "core/utils/IOUtils.h"
-#include "module/sdk/GFSDKModule.h"
+#include "sdk/GFSDKModule.h"
 #include "utils/BuildInfoUtils.h"
 
 namespace GpgFrontend::Module {
diff --git a/src/pinentry/CMakeLists.txt b/src/pinentry/CMakeLists.txt
index cce5fcfb..b740198f 100644
--- a/src/pinentry/CMakeLists.txt
+++ b/src/pinentry/CMakeLists.txt
@@ -60,3 +60,8 @@ target_link_libraries(gpgfrontend_pinentry PRIVATE spdlog)
 
 # using std c++ 17
 target_compile_features(gpgfrontend_pinentry PUBLIC cxx_std_17)
+
+# lib output path
+set_target_properties(gpgfrontend_pinentry PROPERTIES
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib)
diff --git a/src/module/CMakeLists.txt b/src/sdk/CMakeLists.txt
index 7f71c5a2..c8a10e7d 100644
--- a/src/module/CMakeLists.txt
+++ b/src/sdk/CMakeLists.txt
@@ -27,10 +27,10 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 
 # define libgpgfrontend_module_sdk
-aux_source_directory(sdk MODULE_SDK_SOURCE)
+aux_source_directory(. MODULE_SDK_SOURCE)
 
 add_library(gpgfrontend_module_sdk SHARED ${MODULE_SDK_SOURCE})
-set(_export_file_sdk "${CMAKE_CURRENT_SOURCE_DIR}/sdk/GFSDKExport.h")
+set(_export_file_sdk "${CMAKE_CURRENT_SOURCE_DIR}/GFSDKExport.h")
 generate_export_header(gpgfrontend_module_sdk EXPORT_FILE_NAME "${_export_file_sdk}")
 target_include_directories(gpgfrontend_module_sdk PRIVATE 
   ${CMAKE_CURRENT_BINARY_DIR}/gpgfrontend_module_sdk_autogen/include
@@ -42,13 +42,13 @@ target_include_directories(gpgfrontend_module_sdk PUBLIC sdk)
 target_link_libraries(gpgfrontend_module_sdk PRIVATE gpgfrontend_core)
 
 # sdk export headers
-file(GLOB _headerPath "${CMAKE_CURRENT_SOURCE_DIR}/sdk/*.h")
+file(GLOB _headerPath "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 set_target_properties(gpgfrontend_module_sdk PROPERTIES PUBLIC_HEADER "${_headerPath}")
 
 # lib output path
 set_target_properties(gpgfrontend_module_sdk PROPERTIES
-  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods
-  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods)
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib)
 
 if (XCODE_BUILD)
   set_target_properties(gpgfrontend_module_sdk
diff --git a/src/module/sdk/GFSDK.h b/src/sdk/GFSDK.h
index 77e019af..77e019af 100644
--- a/src/module/sdk/GFSDK.h
+++ b/src/sdk/GFSDK.h
diff --git a/src/module/sdk/GFSDKBasic.cpp b/src/sdk/GFSDKBasic.cpp
index 4d8af6c8..4d8af6c8 100644
--- a/src/module/sdk/GFSDKBasic.cpp
+++ b/src/sdk/GFSDKBasic.cpp
diff --git a/src/module/sdk/GFSDKBasic.h b/src/sdk/GFSDKBasic.h
index 07ff6ed7..07ff6ed7 100644
--- a/src/module/sdk/GFSDKBasic.h
+++ b/src/sdk/GFSDKBasic.h
diff --git a/src/module/sdk/GFSDKBuildInfo.h b/src/sdk/GFSDKBuildInfo.h
index a64d95c5..a64d95c5 100644
--- a/src/module/sdk/GFSDKBuildInfo.h
+++ b/src/sdk/GFSDKBuildInfo.h
diff --git a/src/module/sdk/GFSDKBuildInfo.h.in b/src/sdk/GFSDKBuildInfo.h.in
index 508c35d4..508c35d4 100644
--- a/src/module/sdk/GFSDKBuildInfo.h.in
+++ b/src/sdk/GFSDKBuildInfo.h.in
diff --git a/src/module/sdk/GFSDKExport.h b/src/sdk/GFSDKExport.h
index a62168bc..a62168bc 100644
--- a/src/module/sdk/GFSDKExport.h
+++ b/src/sdk/GFSDKExport.h
diff --git a/src/module/sdk/GFSDKExtra.cpp b/src/sdk/GFSDKExtra.cpp
index bbfa8575..bbfa8575 100644
--- a/src/module/sdk/GFSDKExtra.cpp
+++ b/src/sdk/GFSDKExtra.cpp
diff --git a/src/module/sdk/GFSDKExtra.h b/src/sdk/GFSDKExtra.h
index 3d7f4226..3d7f4226 100644
--- a/src/module/sdk/GFSDKExtra.h
+++ b/src/sdk/GFSDKExtra.h
diff --git a/src/module/sdk/GFSDKGpg.cpp b/src/sdk/GFSDKGpg.cpp
index 63859763..63859763 100644
--- a/src/module/sdk/GFSDKGpg.cpp
+++ b/src/sdk/GFSDKGpg.cpp
diff --git a/src/module/sdk/GFSDKGpg.h b/src/sdk/GFSDKGpg.h
index 8823bfc5..8823bfc5 100644
--- a/src/module/sdk/GFSDKGpg.h
+++ b/src/sdk/GFSDKGpg.h
diff --git a/src/module/sdk/GFSDKLog.cpp b/src/sdk/GFSDKLog.cpp
index 603cc325..603cc325 100644
--- a/src/module/sdk/GFSDKLog.cpp
+++ b/src/sdk/GFSDKLog.cpp
diff --git a/src/module/sdk/GFSDKLog.h b/src/sdk/GFSDKLog.h
index 77e019af..77e019af 100644
--- a/src/module/sdk/GFSDKLog.h
+++ b/src/sdk/GFSDKLog.h
diff --git a/src/module/sdk/GFSDKModule.cpp b/src/sdk/GFSDKModule.cpp
index 00594488..00594488 100644
--- a/src/module/sdk/GFSDKModule.cpp
+++ b/src/sdk/GFSDKModule.cpp
diff --git a/src/module/sdk/GFSDKModule.h b/src/sdk/GFSDKModule.h
index 67c1f492..67c1f492 100644
--- a/src/module/sdk/GFSDKModule.h
+++ b/src/sdk/GFSDKModule.h
diff --git a/src/module/sdk/GFSDKUI.cpp b/src/sdk/GFSDKUI.cpp
index 63859763..63859763 100644
--- a/src/module/sdk/GFSDKUI.cpp
+++ b/src/sdk/GFSDKUI.cpp
diff --git a/src/module/sdk/GFSDKUI.h b/src/sdk/GFSDKUI.h
index 0702632a..0702632a 100644
--- a/src/module/sdk/GFSDKUI.h
+++ b/src/sdk/GFSDKUI.h
diff --git a/src/module/sdk/GFSDKUtils.cpp b/src/sdk/GFSDKUtils.cpp
index fcb510e3..fcb510e3 100644
--- a/src/module/sdk/GFSDKUtils.cpp
+++ b/src/sdk/GFSDKUtils.cpp
diff --git a/src/module/sdk/GFSDKUtils.h b/src/sdk/GFSDKUtils.h
index 7d72e9ee..7d72e9ee 100644
--- a/src/module/sdk/GFSDKUtils.h
+++ b/src/sdk/GFSDKUtils.h
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index e6b41b50..32e69481 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -75,6 +75,11 @@ target_include_directories(gpgfrontend_ui PUBLIC
 # using std c++ 17
 target_compile_features(gpgfrontend_ui PUBLIC cxx_std_17)
 
+# lib output path
+set_target_properties(gpgfrontend_ui PROPERTIES
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib)
+
 # for xcode archive build
 if (XCODE_BUILD)
     set_target_properties(gpgfrontend_ui
diff --git a/src/ui/dialog/settings/SettingsGeneral.cpp b/src/ui/dialog/settings/SettingsGeneral.cpp
index 9764b747..3a6cbf70 100644
--- a/src/ui/dialog/settings/SettingsGeneral.cpp
+++ b/src/ui/dialog/settings/SettingsGeneral.cpp
@@ -129,6 +129,11 @@ void GeneralTab::SetSettings() {
   ui_->importConfirmationCheckBox->setCheckState(
       confirm_import_keys ? Qt::Checked : Qt::Unchecked);
 
+  auto more_signing_options =
+      settings.value("basic/more_signing_options", false).toBool();
+  ui_->moreSigningOptionsCheckBox->setCheckState(
+      more_signing_options ? Qt::Checked : Qt::Unchecked);
+
   auto lang_key = settings.value("basic/lang").toString();
   auto lang_value = lang_.value(lang_key);
   GF_UI_LOG_DEBUG("lang settings current: {}", lang_value);
@@ -152,6 +157,8 @@ void GeneralTab::ApplySettings() {
                     ui_->restoreTextEditorPageCheckBox->isChecked());
   settings.setValue("basic/confirm_import_keys",
                     ui_->importConfirmationCheckBox->isChecked());
+  settings.setValue("basic/more_signing_options",
+                    ui_->moreSigningOptionsCheckBox->isChecked());
   settings.setValue("basic/lang", lang_.key(ui_->langSelectBox->currentText()));
 }