Page MenuHome GnuPG
Files F18825079

No OneTemporary
Actions

View Options

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index e41d01c..d5b8d3d 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -1,21 +1,26 @@
add_executable(gpgpass)
target_link_libraries(gpgpass gpgpass_internal KF${QT_MAJOR_VERSION}::IconThemes)
if (QT_MAJOR_VERSION STREQUAL "6")
target_link_libraries(gpgpass KF${QT_MAJOR_VERSION}::ColorScheme KPim6::Libkleo)
endif()
ecm_add_app_icon(GPGPASS_ICONS ICONS ${CMAKE_SOURCE_DIR}/artwork/sc-gpgpass.svg ${CMAKE_SOURCE_DIR}/artwork/32-gpgpass.png ${CMAKE_SOURCE_DIR}/artwork/64-gpgpass.png ${CMAKE_SOURCE_DIR}/artwork/256-gpgpass.png)
-target_sources(gpgpass PRIVATE main.cpp aboutdata.cpp ${GPGPASS_ICONS})
+target_sources(gpgpass PRIVATE
+ main.cpp
+ aboutdata.cpp
+ gpgpass.qrc
+ ${GPGPASS_ICONS}
+)
target_compile_definitions(gpgpass PRIVATE QT_NO_TRANSLATION)
if(WIN32)
configure_file(versioninfo.rc.in versioninfo.rc)
configure_file(gpgpass.w32-manifest.in gpgpass.w32-manifest)
target_sources(gpgpass PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc
${CMAKE_CURRENT_BINARY_DIR}/gpgpass.w32-manifest
)
endif()
install(TARGETS gpgpass ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/main/gpgpass.qrc b/main/gpgpass.qrc
new file mode 100644
index 0000000..2ddc639
--- /dev/null
+++ b/main/gpgpass.qrc
@@ -0,0 +1,9 @@
+<RCC>
+<!--
+SPDX-FileCopyrightText: 2024 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: GPL-2.0-or-later
+-->
+ <qresource prefix="/kxmlgui5/gpgpass">
+ <file>gpgpassui.rc</file>
+ </qresource>
+</RCC>
diff --git a/src/gpgpassui.rc b/main/gpgpassui.rc
similarity index 100%
rename from src/gpgpassui.rc
rename to main/gpgpassui.rc
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1114541..a9e46d5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,128 +1,126 @@
# let's put most of the "meat" in a static library this way, we can also unit
# test parts of it
add_library(gpgpass_internal STATIC)
target_sources(gpgpass_internal PRIVATE
../resources.qrc
clipboardhelper.cpp
clipboardhelper.h
gpgmehelpers.h
gpgmehelpers.h
passentry.cpp
passentry.h
passphrasegenerator.cpp
passphrasegenerator.h
passwordhealth.cpp
passwordhealth.h
passwordgenerator.cpp
passwordgenerator.h
rootfoldersmanager.cpp
rootfoldersmanager.h
userinfo.cpp
userinfo.h
util.cpp
util.h
job/directoryreencryptjob.cpp
job/directoryreencryptjob.h
job/fileencryptjob.cpp
job/fileencryptjob.h
job/filedecryptjob.cpp
job/filedecryptjob.h
job/filereencryptjob.cpp
job/filereencryptjob.h
conf/configuredialog.cpp
conf/configuredialog.h
conf/generalconfigurationpage.cpp
conf/generalconfigurationpage.h
conf/gpgpassconfigmodule.cpp
conf/gpgpassconfigmodule.h
conf/gpgpasspageconfigdialog.cpp
conf/gpgpasspageconfigdialog.h
conf/rootfoldersconfigurationpage.cpp
conf/rootfoldersconfigurationpage.h
conf/templateconfigurationpage.cpp
conf/templateconfigurationpage.h
models/addfileinfoproxy.cpp
models/addfileinfoproxy.h
models/storemodel.cpp
models/storemodel.h
models/userslistmodel.cpp
models/userslistmodel.h
models/rootfoldersmodel.cpp
models/rootfoldersmodel.h
widgets/adjustingscrollarea.cpp
widgets/adjustingscrollarea.h
widgets/deselectabletreeview.h
widgets/formtextinput.cpp
widgets/formtextinput.h
widgets/mainwindow.cpp
widgets/mainwindow.h
widgets/passwordeditorwidget.cpp
widgets/passwordeditorwidget.h
widgets/passwordgeneratorwidget.cpp
widgets/passwordgeneratorwidget.h
widgets/passwordviewerwidget.cpp
widgets/passwordviewerwidget.h
widgets/qpushbuttonfactory.h
widgets/qrcodepopup.cpp
widgets/qrcodepopup.h
widgets/setupwidget.cpp
widgets/setupwidget.h
widgets/usersdialog.cpp
widgets/usersdialog.h
widgets/welcomewidget.cpp
widgets/welcomewidget.h
zxcvbn/zxcvbn.c
zxcvbn/zxcvbn.h
)
kconfig_add_kcfg_files(gpgpass_internal GENERATE_MOC
config.kcfgc
rootfolderconfig.kcfgc
)
ki18n_wrap_ui(gpgpass_internal
conf/generalconfigurationpage.ui
conf/rootfoldersconfigurationpage.ui
conf/templateconfigurationpage.ui
widgets/passwordeditorwidget.ui
widgets/passwordgeneratorwidget.ui
widgets/welcomewidget.ui
widgets/mainwindow.ui
widgets/usersdialog.ui
widgets/userswidget.ui
)
target_link_libraries(gpgpass_internal
Qt::Widgets
KF${QT_MAJOR_VERSION}::CoreAddons
KF${QT_MAJOR_VERSION}::ConfigCore
KF${QT_MAJOR_VERSION}::ConfigGui
KF${QT_MAJOR_VERSION}::Prison
KF${QT_MAJOR_VERSION}::IconThemes
KF${QT_MAJOR_VERSION}::I18n
KF${QT_MAJOR_VERSION}::WidgetsAddons
KF${QT_MAJOR_VERSION}::ItemModels
KF${QT_MAJOR_VERSION}::ItemViews
KF${QT_MAJOR_VERSION}::KIOWidgets
KF${QT_MAJOR_VERSION}::XmlGui
KPim${QT_MAJOR_VERSION}::Libkleo
)
-install(FILES gpgpassui.rc DESTINATION ${KDE_INSTALL_KXMLGUIDIR}/gpgpass)
-
if (QT_MAJOR_VERSION STREQUAL "6")
target_link_libraries(gpgpass_internal QGpgmeQt6 LibGpgError::LibGpgError KF6::ColorScheme)
target_sources(gpgpass_internal PRIVATE
job/openpgpcertificatecreationjob.cpp
job/openpgpcertificatecreationjob.h
)
else()
target_link_libraries(gpgpass_internal QGpgme KF5::ConfigWidgets)
endif()

File Metadata

Mime Type
text/x-diff
Expires
Mon, Dec 23, 1:54 PM (1 d, 7 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
f7/54/533096ca01b03b91f3615ecb367f

Event Timeline