CMakeLists.txt

@@ -30,17 +30,14 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_SOURCE_DIR}/cmake/FlagsOverrides.cma
 
 # define project
 project(GpgFrontendModules
-  VERSION 2.1.4
+    VERSION 2.1.3
-  DESCRIPTION "Modules of GpgFrontend"
+    DESCRIPTION "Modules of GpgFrontend"
-  HOMEPAGE_URL "https://gpgfrontend.bktus.com"
+    HOMEPAGE_URL "https://gpgfrontend.bktus.com"
-  LANGUAGES CXX)
+    LANGUAGES CXX)
 
 # includes
 include(GenerateExportHeader)
 
-# function or mode options
-option(GPGFRONTEND_QT5_BUILD "Swith to Qt5 building mode" OFF)
-
 # Using Standard C++-17 (Consider compatibility)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -64,24 +61,24 @@ set(SDK_LIB_PATH "${SDK_PATH}/lib")
 message(STATUS "SDK Path: ${SDK_PATH}")
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/include
+    ${CMAKE_SOURCE_DIR}/include
-  ${SDK_INCLUDE_PATH}
+    ${SDK_INCLUDE_PATH}
 )
 
 link_directories(
-  ${SDK_LIB_PATH}
+    ${SDK_LIB_PATH}
 )
 
 # Introduce Qt
 # Support Qt version: 6.x
 if(GPGFRONTEND_QT5_BUILD)
-  # Introduce Qt
+    # Introduce Qt
-  # Support Qt version: 5.15.x
+    # Support Qt version: 5.15.x
-  find_package(Qt5 5.15 COMPONENTS Core Widgets Network LinguistTools REQUIRED)
+    find_package(Qt5 5.15 COMPONENTS Core Widgets Network LinguistTools REQUIRED)
 else()
-  # Introduce Qt
+    # Introduce Qt
-  # Support Qt version: 6.x
+    # Support Qt version: 6.x
-  find_package(Qt6 6 COMPONENTS Core Widgets Network LinguistTools REQUIRED)
+    find_package(Qt6 6 COMPONENTS Core Widgets Network LinguistTools REQUIRED)
 endif()
 
 # Qt configuration
@@ -92,24 +89,24 @@ set(CMAKE_AUTORCC_OPTIONS "--compress;9")
 
 # rpath config
 if(WIN32)
-  message(STATUS "Configuring for Windows without rpath")
+    message(STATUS "Configuring for Windows without rpath")
 elseif(APPLE)
-  set(CMAKE_MACOSX_RPATH 1)
+    set(CMAKE_MACOSX_RPATH 1)
-  set(CMAKE_INSTALL_RPATH "@loader_path/../lib")
+    set(CMAKE_INSTALL_RPATH "@loader_path/../lib")
 
-  include_directories(
+    include_directories(
-    /usr/local/include
+        /usr/local/include
-    /opt/homebrew/include
+        /opt/homebrew/include
-  )
+    )
 
-  link_directories(
+    link_directories(
-    /usr/local/lib
+        /usr/local/lib
-    /opt/homebrew/lib
+        /opt/homebrew/lib
-  )
+    )
 else()
-  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-  set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+    set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-  set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/../lib")
+    set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/../lib")
 endif()
 
 # third_party

README.md

@@ -1,88 +1,8 @@
 # GpgFrontend Modules
 
-This repository hosts all the inherited module code for GpgFrontend. These
+This repository holds project files related to the development of the
-modules are packaged with the GpgFrontend main program by default. The module
+GpgFrontend module. A new module is developed by creating a new folder, under
-code hosted in this repository needs to be reviewed by the project maintainer,
+src.
-Saturneric, to ensure high security. Therefore, GpgFrontend automatically loads
-these modules at startup by default. Users can also disable any or all of these
-modules in the settings provided by GpgFrontend. On some operating system
-platforms, GpgFrontend is released via compressed files rather than images, and
-users can delete a specific module or all modules by removing the corresponding
-dynamic link library (DLL).
 
-## About the Modules
+These modules will be automatically compiled and released with each GpgFrontend
-
+release.
-Module support is a key extension feature of GpgFrontend. By encapsulating
-functionality into modules, users can tailor GpgFrontend to their needs. They
-can temporarily disable or even delete a particular feature. This approach
-avoids loading a large amount of code that not everyone may use into the
-GpgFrontend main program. Consequently, the GpgFrontend main program becomes
-more stable, concise, and focused on performing tasks well.
-
-Another benefit of introducing module support is that anyone can participate
-without needing to learn the architecture and various mechanisms of the
-GpgFrontend main program. Through a brief API provided by the SDK, utilizing
-easy-to-understand and flexible event and anchor mechanisms, modules can play
-their roles. Users can write and publish their own modules or contribute to this
-repository.
-
-### SDK and API Usage
-
-The SDK API uses C-style function parameters and ABI. Once the API stabilizes,
-it will largely remain unchanged, significantly improving the binary
-compatibility of the SDK dynamic library. Only the integrated modules in this
-repository will be dynamically loaded during initialization, not user-defined
-modules.
-
-Due to GPL-3.0's definition regarding whether module code is part of the overall
-program or a new program, GpgFrontend modules must also be released under the
-GPL-3.0 or later license. Modules can freely utilize the capabilities of the Qt
-libraries used by GpgFrontend, including Core, Widget, and Network. This means
-that modules will only be loaded by GpgFrontend if they use the same version of
-the Qt libraries.
-
-Modules using an SDK version higher than what GpgFrontend supports will not be
-loaded. The SDK version number corresponds directly to the GpgFrontend version
-number. In the absence of comprehensive documentation, users can refer to the
-implementation code of existing modules to develop their own modules if
-necessary.
-
-I am committed to adding more modules in the future, and any functionality not
-directly related to the core focus of GpgFrontend will be developed as modules.
-Unfortunately, due to time constraints, I cannot maintain both the Qt5 and Qt6
-versions of the integrated modules. Therefore, the integrated modules in this
-repository no longer support Qt5 and will not be released with the Qt5 version
-of GpgFrontend. However, the Qt5 version of GpgFrontend still includes a
-complete module system, so users can develop or port their own modules.
-
-### Module Development
-
-Compiling a module relies on the SDK header files, which then need to be linked
-with the corresponding `libgpgfrontend_module_sdk` library (dynamic library).
-Specific methods and project configuration can refer to the existing module
-project configuration files in this repository. Currently, GpgFrontend provides
-build options to compile and install the SDK, namely
-`GPGFRONTEND_BUILD_TYPE_FULL_SDK` and `GPGFRONTEND_BUILD_TYPE_ONLY_SDK`.
-
-After compiling the SDK with GpgFrontend, it usually includes the `include` and
-`lib` folders. These can be directly installed or placed in the corresponding
-version number directory under the `sdk` directory in this repository, such as
-`sdk/2.1.3`. Then, you can run the feature configuration and compile the module
-code in this repository.
-
-Modules are released as single dynamic libraries. The file extension for dynamic
-libraries varies across operating systems, so the code in this repository needs
-to be able to compile into dynamic libraries on all operating systems supported
-by GpgFrontend.
-
-Introducing third-party libraries to integrated modules (other than those
-already used by GpgFrontend) requires great caution and should only be done when
-necessary. If the Qt library can provide the required functionality, make every
-effort to use functions from the Qt library first. If a third-party library is
-indeed needed, it must be installed as a dynamic library along with the module
-itself in the correct directory.
-
-User-developed module code does not need to be included in this repository.
-Users can develop their own modules for personal use or limited distribution.
-The advantage of placing your module in this repository is that it will be
-released with GpgFrontend, making it available to a broader audience.

src/CMakeLists.txt

@@ -24,7 +24,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # modules
-
 add_subdirectory(m_ver_check)
 add_subdirectory(m_gpg_info)
 add_subdirectory(m_pinentry)

src/m_paper_key/CMakeLists.txt

@@ -31,7 +31,7 @@ aux_source_directory(. INTEGRATED_MODULE_SOURCE)
 add_library(mod_paper_key SHARED ${INTEGRATED_MODULE_SOURCE})
 
 # install dir
-install(TARGETS mod_paper_key
+install(TARGETS mod_paper_key 
   LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/modules")
 
 # link sdk

src/m_pinentry/CMakeLists.txt

@@ -27,8 +27,7 @@ aux_source_directory(. INTEGRATED_MODULE_SOURCE)
 
 # capslock
 list(APPEND INTEGRATED_MODULE_SOURCE "capslock/capslock.cpp")
-
+if (MINGW)
-if(MINGW)
   list(APPEND INTEGRATED_MODULE_SOURCE "capslock/capslock_win.cpp")
 else()
   list(APPEND INTEGRATED_MODULE_SOURCE "capslock/capslock_unix.cpp")
@@ -40,9 +39,10 @@ list(APPEND INTEGRATED_MODULE_SOURCE "pinentry.qrc")
 add_library(mod_pinentry SHARED ${INTEGRATED_MODULE_SOURCE})
 
 # install dir
-install(TARGETS mod_pinentry
+install(TARGETS mod_pinentry 
   LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/modules")
 
+
 # link options
 
 # link sdk
@@ -57,5 +57,7 @@ else()
   target_link_libraries(mod_pinentry PUBLIC Qt6::Widgets)
 endif()
 
+
 # using std c++ 17
 target_compile_features(mod_pinentry PUBLIC cxx_std_17)
+