[pim/kmail] /: Add pre-commit CI support
Laurent Montel
null at kde.org
Sun Jun 8 21:40:56 BST 2025
Git commit c57505dccbe8383e46377b64c3b312ea9cde1023 by Laurent Montel.
Committed on 08/06/2025 at 20:40.
Pushed by mlaurent into branch 'master'.
Add pre-commit CI support
M +1 -2 .gitlab-ci.yml
M +1 -1 .kde-ci.yml
M +129 -39 CMakeLists.txt
M +1 -1 LICENSES/GPL-2.0-only.txt
M +1 -1 LICENSES/GPL-2.0-or-later.txt
M +67 -47 agents/archivemailagent/CMakeLists.txt
M +0 -1 agents/archivemailagent/akonadi_archivemail_agent.notifyrc
M +27 -7 agents/archivemailagent/autotests/CMakeLists.txt
M +58 -33 agents/followupreminderagent/CMakeLists.txt
M +0 -1 agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc
M +6 -2 agents/followupreminderagent/autotests/CMakeLists.txt
M +0 -1 agents/followupreminderagent/followupreminderagentsettings.kcfgc
M +58 -32 agents/mailfilteragent/CMakeLists.txt
M +1 -1 agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc
M +2 -1 agents/mailfilteragent/tests/filterlogdialog/CMakeLists.txt
M +9 -5 agents/mailfilteragent/tests/mailfilteragentdbus/CMakeLists.txt
M +8 -13 agents/mailfilteragent/tests/test_dbus_interface/CMakeLists.txt
M +36 -21 agents/mailmergeagent/CMakeLists.txt
M +1 -1 agents/mailmergeagent/autotests/CMakeLists.txt
M +0 -1 agents/mailmergeagent/mailmergeagentsettings.kcfgc
M +25 -16 agents/sendlateragent/CMakeLists.txt
M +0 -1 agents/sendlateragent/akonadi_sendlater_agent.notifyrc
M +1 -1 agents/sendlateragent/autotests/CMakeLists.txt
M +1 -3 agents/sendlateragent/tests/CMakeLists.txt
M +40 -23 agents/unifiedmailboxagent/CMakeLists.txt
M +1 -3 agents/unifiedmailboxagent/autotests/CMakeLists.txt
M +0 -1 agents/unifiedmailboxagent/autotests/unittestenv/xdgconfig/akonadi_knut_resource_0rc
M +0 -2 agents/unifiedmailboxagent/autotests/unittestenv/xdgconfig/akonadi_knut_resource_1rc
M +0 -1 agents/unifiedmailboxagent/autotests/unittestenv/xdglocal/testdata-res2.xml
M +0 -2 agents/unifiedmailboxagent/autotests/unittestenv/xdglocal/testdata-res3.xml
M +0 -1 agents/unifiedmailboxagent/settings.kcfg
M +0 -1 config-enterprise.h.in
M +11 -11 doc/akonadi_archivemail_agent/index.docbook
M +2 -2 doc/akonadi_followupreminder_agent/index.docbook
M +4 -4 doc/akonadi_sendlater_agent/index.docbook
M +213 -213 doc/kmail2/configure.docbook
M +3 -3 doc/kmail2/credits-and-licenses.docbook
M +63 -63 doc/kmail2/faq.docbook
M +39 -39 doc/kmail2/getting-started.docbook
M +2 -2 doc/kmail2/intro.docbook
M +31 -31 doc/kmail2/menus.docbook
M +49 -49 doc/kmail2/troubleshooting.docbook
M +135 -135 doc/kmail2/using-kmail.docbook
M +25 -16 kmail-refresh-settings/CMakeLists.txt
M +4 -1 ktnef/CMakeLists.txt
M +1 -1 ktnef/doc/index.docbook
M +26 -19 ktnef/src/CMakeLists.txt
M +0 -1 ktnef/src/ktnef.qrc
M +0 -1 readme-build-ftime.txt
M +414 -392 src/CMakeLists.txt
M +7 -5 src/activities/autotests/CMakeLists.txt
M +100 -23 src/autotests/CMakeLists.txt
M +1 -1 src/autotests/data/gnupg/gpg.conf
M +0 -1 src/autotests/multipartmixed.mbox
M +3 -4 src/autotests/signedmail.mbox
M +0 -1 src/autotests/unittestenv/xdgconfig/akonadi_knut_resource_0rc
M +4 -1 src/avscripts/CMakeLists.txt
M +7 -7 src/avscripts/kmail_antivir.sh
M +11 -11 src/avscripts/kmail_clamav.sh
M +19 -19 src/avscripts/kmail_fprot.sh
M +7 -7 src/avscripts/kmail_sav.sh
M +0 -1 src/editor/custommimeheader/custommimeheader.kcfgc
M +70 -19 src/editor/potentialphishingemail/autotests/CMakeLists.txt
M +44 -9 src/editor/warningwidgets/autotests/CMakeLists.txt
M +12 -6 src/folderarchive/autotests/CMakeLists.txt
M +12 -6 src/historyclosedreader/autotests/CMakeLists.txt
M +1 -2 src/historyswitchfolder/autotests/CMakeLists.txt
M +1 -2 src/job/autotests/CMakeLists.txt
M +3 -3 src/kmail_part.rc
M +3 -3 src/kmcomposerui.rc
M +3 -3 src/kmmainwin.rc
M +46 -7 src/kontactplugin/kmail/CMakeLists.txt
M +34 -7 src/kontactplugin/summary/CMakeLists.txt
M +1 -3 src/pics/CMakeLists.txt
M +5 -6 src/scripts/mh2kmail
M +11 -11 src/scripts/mh2kmailr
M +2 -2 src/settings/kmail.kcfg.in
M +7 -6 src/sieveimapinterface/tests/sievedebugdialog/CMakeLists.txt
M +5 -4 src/sieveimapinterface/tests/sievemanagerdialog/CMakeLists.txt
M +7 -2 src/sieveimapinterface/tests/vacation/CMakeLists.txt
M +7 -3 src/tests/CMakeLists.txt
M +1 -1 src/undosend/autotests/CMakeLists.txt
https://invent.kde.org/pim/kmail/-/commit/c57505dccbe8383e46377b64c3b312ea9cde1023
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bca1f9a26d..e328c18184 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,7 @@ include:
file:
- /gitlab-templates/linux-qt6.yml
- /gitlab-templates/linux-qt6-next.yml
- - /gitlab-templates/json-validation.yml
- /gitlab-templates/freebsd-qt6.yml
- /gitlab-templates/cppcheck.yml
- - /gitlab-templates/clang-format.yml
- /gitlab-templates/windows-qt6.yml
+ - /gitlab-templates/pre-commit.yml
diff --git a/.kde-ci.yml b/.kde-ci.yml
index e6b5b2e642..6b59f258bf 100644
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -60,4 +60,4 @@ Dependencies:
Options:
cmake-options: "-DAKONADI_RUN_MYSQL_ISOLATED_TESTS=FALSE -DAKONADI_RUN_PGSQL_ISOLATED_TESTS=FALSE -DAKONADI_RUN_SQLITE_ISOLATED_TESTS=FALSE"
- require-passing-tests-on: [ '@all' ]
+ require-passing-tests-on: [ '@all' ]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57e0ebfc35..5c7673d279 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,6 @@ project(kmail VERSION ${PIM_VERSION})
include(CheckIncludeFiles)
-
set(KF_MIN_VERSION "6.13.0")
set(QT_REQUIRED_VERSION "6.8.0")
set(CMAKE_CXX_STANDARD 20)
@@ -21,10 +20,23 @@ include(ECMAddTests)
include(GenerateExportHeader)
include(ECMGenerateHeaders)
-include(KDEGitCommitHooks)
-include(KDEClangFormat)
file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c)
-kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+set(PRE_COMMIT_INSTALLED FALSE)
+if(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
+ if(EXISTS "${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit")
+ file(READ "${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit" FILE_CONTENTS)
+ string(FIND "${FILE_CONTENTS}" "File generated by pre-commit" INDEX)
+ if(${INDEX} GREATER_EQUAL 0)
+ set(PRE_COMMIT_INSTALLED TRUE)
+ endif()
+ endif()
+endif()
+if(NOT ${PRE_COMMIT_INSTALLED})
+ include(KDEGitCommitHooks)
+ include(KDEClangFormat)
+ kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+endif()
+
include(CheckFunctionExists)
include(KDEInstallDirs)
@@ -47,8 +59,9 @@ if(DEFINED KDEPIM_DEV_VERSION)
set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
endif()
-set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})")
-
+set(KDEPIM_VERSION
+ "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})"
+)
set(AKONADI_MIMELIB_VERSION "6.4.40")
set(AKONADI_CONTACT_VERSION "6.4.40")
@@ -67,9 +80,18 @@ set(KDEPIM_LIB_VERSION "${PIM_VERSION}")
set(KDEPIM_LIB_SOVERSION "6")
set(KTEXTADDONS_MIN_VERSION "1.6.0")
-option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
+option(
+ KDEPIM_ENTERPRISE_BUILD
+ "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client."
+ FALSE
+)
-find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngineWidgets)
+find_package(
+ Qt6
+ ${QT_REQUIRED_VERSION}
+ CONFIG
+ REQUIRED DBus Network Test Widgets WebEngineWidgets
+)
set(LIBGRAVATAR_VERSION "6.4.40")
set(MAILCOMMON_LIB_VERSION "6.4.42")
set(MESSAGELIB_LIB_VERSION "6.4.40")
@@ -82,16 +104,39 @@ set(QT6KEYCHAIN_LIB_VERSION "0.14.2")
find_package(KPim6WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
-option(FORCE_DISABLE_AKONADI_SEARCH "Disable features and API that require akonadi-search, e.g. because xapian isn't available" OFF)
+option(
+ FORCE_DISABLE_AKONADI_SEARCH
+ "Disable features and API that require akonadi-search, e.g. because xapian isn't available"
+ OFF
+)
if(UNIX)
if(NOT FORCE_DISABLE_AKONADI_SEARCH)
- find_package(KPim6AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)
- set_package_properties(KPim6AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://invent.kde.org/pim/akonadi-search" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
+ find_package(
+ KPim6AkonadiSearch
+ ${AKONADI_SEARCH_VERSION}
+ CONFIG
+ REQUIRED
+ )
+ set_package_properties(
+ KPim6AkonadiSearch
+ PROPERTIES
+ DESCRIPTION "The Akonadi Search libraries"
+ URL "https://invent.kde.org/pim/akonadi-search"
+ TYPE REQUIRED
+ PURPOSE "Provides search capabilities in KMail and Akonadi"
+ )
endif()
else()
if(NOT FORCE_DISABLE_AKONADI_SEARCH)
find_package(KPim6AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG)
- set_package_properties(KPim6AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://invent.kde.org/pim/akonadi-search" TYPE OPTIONAL PURPOSE "Provides search capabilities in KMail and Akonadi")
+ set_package_properties(
+ KPim6AkonadiSearch
+ PROPERTIES
+ DESCRIPTION "The Akonadi Search libraries"
+ URL "https://invent.kde.org/pim/akonadi-search"
+ TYPE OPTIONAL
+ PURPOSE "Provides search capabilities in KMail and Akonadi"
+ )
endif()
endif()
@@ -108,9 +153,9 @@ find_package(KF6Config ${KF_MIN_VERSION} CONFIG REQUIRED)
find_package(KF6Crash ${KF_MIN_VERSION} CONFIG REQUIRED)
find_package(KF6DBusAddons ${KF_MIN_VERSION} CONFIG REQUIRED)
find_package(KF6DocTools ${KF_MIN_VERSION})
-set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
- "Tools to generate documentation"
- TYPE OPTIONAL
+set_package_properties(
+ KF6DocTools
+ PROPERTIES DESCRIPTION "Tools to generate documentation" TYPE OPTIONAL
)
find_package(KF6GuiAddons ${KF_MIN_VERSION} REQUIRED)
find_package(KF6I18n ${KF_MIN_VERSION} CONFIG REQUIRED)
@@ -132,15 +177,30 @@ find_package(KF6CalendarCore ${KF_MIN_VERSION} CONFIG REQUIRED)
find_package(KF6StatusNotifierItem ${KF_MIN_VERSION} CONFIG REQUIRED)
find_package(KPim6Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
-find_package(KPim6AkonadiContactWidgets ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
+find_package(
+ KPim6AkonadiContactWidgets
+ ${AKONADI_CONTACT_VERSION}
+ CONFIG
+ REQUIRED
+)
find_package(KPim6AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
find_package(KPim6CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED)
-find_package(KPim6IdentityManagementCore ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
+find_package(
+ KPim6IdentityManagementCore
+ ${IDENTITYMANAGEMENT_LIB_VERSION}
+ CONFIG
+ REQUIRED
+)
find_package(KPim6LdapWidgets ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
find_package(KPim6MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
find_package(KPim6TextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
-find_package(KPim6KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
+find_package(
+ KPim6KontactInterface
+ ${KONTACTINTERFACE_LIB_VERSION}
+ CONFIG
+ REQUIRED
+)
find_package(KPim6Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
find_package(KPim6Gravatar ${LIBGRAVATAR_VERSION} CONFIG REQUIRED)
@@ -162,26 +222,41 @@ set(CMAKE_MODULE_PATH ${LIBKLEO_MODULE_PATH} ${CMAKE_MODULE_PATH})
find_package(LibGpgError ${GPG_ERROR_REQUIRED_VERSION} REQUIRED)
find_package(KF6TextEditTextToSpeech ${KTEXTADDONS_MIN_VERSION} CONFIG)
-set_package_properties(KF6TextEditTextToSpeech PROPERTIES DESCRIPTION
- "Add support for text to speech"
- TYPE OPTIONAL
+set_package_properties(
+ KF6TextEditTextToSpeech
+ PROPERTIES DESCRIPTION "Add support for text to speech" TYPE OPTIONAL
)
if(TARGET KF6::TextEditTextToSpeech)
add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
endif()
-find_package(KF6TextAutoCorrectionWidgets ${KTEXTADDONS_MIN_VERSION} CONFIG REQUIRED)
+find_package(
+ KF6TextAutoCorrectionWidgets
+ ${KTEXTADDONS_MIN_VERSION}
+ CONFIG
+ REQUIRED
+)
find_package(KF6TextUtils ${KTEXTADDONS_MIN_VERSION} CONFIG REQUIRED)
find_package(KF6TextCustomEditor ${KTEXTADDONS_MIN_VERSION} CONFIG REQUIRED)
find_package(Qt6Keychain ${QT6KEYCHAIN_LIB_VERSION} CONFIG)
-set_package_properties(Qt6Keychain PROPERTIES
- DESCRIPTION "Provides support for secure credentials storage"
- URL "https://github.com/frankosterfeld/qtkeychain"
- TYPE REQUIRED)
+set_package_properties(
+ Qt6Keychain
+ PROPERTIES
+ DESCRIPTION "Provides support for secure credentials storage"
+ URL "https://github.com/frankosterfeld/qtkeychain"
+ TYPE REQUIRED
+)
-configure_file(config-enterprise.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h)
+configure_file(
+ config-enterprise.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h
+)
include_directories(${kmail_SOURCE_DIR} ${kmail_BINARY_DIR})
-configure_file(kmail-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/kmail-version.h @ONLY)
+configure_file(
+ kmail-version.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/kmail-version.h
+ @ONLY
+)
if(BUILD_TESTING)
add_definitions(-DBUILD_TESTING)
endif()
@@ -190,36 +265,50 @@ ecm_set_disabled_deprecation_versions(QT 6.10.0
KF 6.15.0
)
find_package(KF6UserFeedback ${KF_MIN_VERSION} CONFIG)
-set_package_properties(KF6UserFeedback PROPERTIES DESCRIPTION "User Feedback lib" TYPE OPTIONAL PURPOSE "Allow to send Telemetry Information (optional).")
+set_package_properties(
+ KF6UserFeedback
+ PROPERTIES
+ DESCRIPTION "User Feedback lib"
+ TYPE OPTIONAL
+ PURPOSE "Allow to send Telemetry Information (optional)."
+)
if(TARGET KF6::UserFeedbackWidgets)
set(KMAIL_WITH_KUSERFEEDBACK true)
endif()
-
-option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)
+option(
+ USE_UNITY_CMAKE_SUPPORT
+ "Use UNITY cmake support (speedup compile time)"
+ OFF
+)
set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF)
if(USE_UNITY_CMAKE_SUPPORT)
set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON)
endif()
-
if(TARGET KPim6::PimCommonActivities)
- option(OPTION_USE_PLASMA_ACTIVITIES "Activate plasma activities (experimental)" ON)
+ option(
+ OPTION_USE_PLASMA_ACTIVITIES
+ "Activate plasma activities (experimental)"
+ ON
+ )
if(OPTION_USE_PLASMA_ACTIVITIES)
if(NOT WIN32 AND NOT APPLE)
set(OPTION_USE_PLASMA_ACTIVITIES true)
else()
- set(OPTION_USE_PLASMA_ACTIVITIES false)
+ set(OPTION_USE_PLASMA_ACTIVITIES false)
endif()
endif()
if(OPTION_USE_PLASMA_ACTIVITIES)
if(NOT WIN32 AND NOT APPLE)
find_package(PlasmaActivities "6.3.0")
- set_package_properties(PlasmaActivities PROPERTIES DESCRIPTION
- "Allow to compile with plasma activities"
- TYPE OPTIONAL
+ set_package_properties(
+ PlasmaActivities
+ PROPERTIES
+ DESCRIPTION "Allow to compile with plasma activities"
+ TYPE OPTIONAL
)
endif()
@@ -241,11 +330,12 @@ ecm_qt_install_logging_categories(
DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
)
-kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+if(DEFINED kde_configure_git_pre_commit_hook)
+ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+endif()
ki18n_install(po)
if(KF6DocTools_FOUND)
kdoctools_install(po)
add_subdirectory(doc)
endif()
ecm_feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
diff --git a/LICENSES/GPL-2.0-only.txt b/LICENSES/GPL-2.0-only.txt
index 0f3d6411da..5effc0590a 100644
--- a/LICENSES/GPL-2.0-only.txt
+++ b/LICENSES/GPL-2.0-only.txt
@@ -2,7 +2,7 @@ GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/LICENSES/GPL-2.0-or-later.txt b/LICENSES/GPL-2.0-or-later.txt
index 1d80ac3653..96e2bf1e9b 100644
--- a/LICENSES/GPL-2.0-or-later.txt
+++ b/LICENSES/GPL-2.0-or-later.txt
@@ -2,7 +2,7 @@ GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt
index a315bda4dd..d50f235674 100644
--- a/agents/archivemailagent/CMakeLists.txt
+++ b/agents/archivemailagent/CMakeLists.txt
@@ -4,24 +4,25 @@ add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_archivemail_agent\")
add_library(archivemailagent STATIC)
set_property(TARGET archivemailagent PROPERTY POSITION_INDEPENDENT_CODE ON)
-target_sources(archivemailagent PRIVATE
- archivemailkernel.cpp
- archivemailmanager.cpp
- archivemailinfo.cpp
- job/archivejob.cpp
- archivemailagentutil.cpp
- archivemailkernel.h
- archivemailmanager.h
- archivemailinfo.h
- job/archivejob.h
- archivemailagentutil.h
+target_sources(
+ archivemailagent
+ PRIVATE
+ archivemailkernel.cpp
+ archivemailmanager.cpp
+ archivemailinfo.cpp
+ job/archivejob.cpp
+ archivemailagentutil.cpp
+ archivemailkernel.h
+ archivemailmanager.h
+ archivemailinfo.h
+ job/archivejob.h
+ archivemailagentutil.h
)
kconfig_add_kcfg_files(archivemailagent
settings/archivemailagentsettings.kcfgc
)
-
qt_add_dbus_adaptor(libarchivemailagent_SRCS org.freedesktop.Akonadi.ArchiveMailAgent.xml archivemailagent.h ArchiveMailAgent)
target_sources(archivemailagent PRIVATE ${libarchivemailagent_SRCS})
@@ -31,13 +32,13 @@ ecm_qt_declare_logging_category(archivemailagent HEADER archivemailagent_debug.h
EXPORT KMAIL
)
-
ki18n_wrap_ui(archivemailagent ui/archivemailwidget.ui)
#if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
# set_target_properties(archivemailagent PROPERTIES UNITY_BUILD ON)
#endif()
-target_link_libraries(archivemailagent
+target_link_libraries(
+ archivemailagent
KPim6::MailCommon
KPim6::AkonadiAgentWidgetBase
KF6::I18n
@@ -47,9 +48,14 @@ target_link_libraries(archivemailagent
########################### Agent executable ################################
-add_executable(akonadi_archivemail_agent archivemailagent.cpp archivemailagent.h)
+add_executable(
+ akonadi_archivemail_agent
+ archivemailagent.cpp
+ archivemailagent.h
+)
-target_link_libraries(akonadi_archivemail_agent
+target_link_libraries(
+ akonadi_archivemail_agent
archivemailagent
KPim6::AkonadiCore
KPim6::IdentityManagementCore
@@ -64,16 +70,32 @@ target_link_libraries(akonadi_archivemail_agent
)
if(APPLE)
- set_target_properties(akonadi_archivemail_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${kmail_SOURCE_DIR}/agents/Info.plist.template)
- set_target_properties(akonadi_archivemail_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.archivemail")
- set_target_properties(akonadi_archivemail_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Email Archiver")
+ set_target_properties(
+ akonadi_archivemail_agent
+ PROPERTIES
+ MACOSX_BUNDLE_INFO_PLIST
+ ${kmail_SOURCE_DIR}/agents/Info.plist.template
+ )
+ set_target_properties(
+ akonadi_archivemail_agent
+ PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.archivemail"
+ )
+ set_target_properties(
+ akonadi_archivemail_agent
+ PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Email Archiver"
+ )
endif()
install(TARGETS akonadi_archivemail_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES archivemailagent.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents")
-install(FILES akonadi_archivemail_agent.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
-
+install(
+ FILES archivemailagent.desktop
+ DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents"
+)
+install(
+ FILES akonadi_archivemail_agent.notifyrc
+ DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR}
+)
if(BUILD_TESTING)
add_subdirectory(autotests)
@@ -81,33 +103,29 @@ endif()
########## Configuration ##############
-
kcoreaddons_add_plugin(archivemailagentconfig
INSTALL_NAMESPACE pim6/akonadi/config
)
-target_sources(archivemailagentconfig PRIVATE
- addarchivemaildialog.cpp
- addarchivemaildialog.h
-
- addarchivemailwidget.h
- addarchivemailwidget.cpp
-
- archivemailrangewidget.h
- archivemailrangewidget.cpp
-
- widgets/hourcombobox.h
- widgets/hourcombobox.cpp
-
- archivemailwidget.cpp
- archivemailwidget.h
-
- widgets/formatcombobox.cpp
- widgets/formatcombobox.h
-
- widgets/unitcombobox.cpp
- widgets/unitcombobox.h
+target_sources(
+ archivemailagentconfig
+ PRIVATE
+ addarchivemaildialog.cpp
+ addarchivemaildialog.h
+ addarchivemailwidget.h
+ addarchivemailwidget.cpp
+ archivemailrangewidget.h
+ archivemailrangewidget.cpp
+ widgets/hourcombobox.h
+ widgets/hourcombobox.cpp
+ archivemailwidget.cpp
+ archivemailwidget.h
+ widgets/formatcombobox.cpp
+ widgets/formatcombobox.h
+ widgets/unitcombobox.cpp
+ widgets/unitcombobox.h
)
-target_link_libraries(archivemailagentconfig
+target_link_libraries(
+ archivemailagentconfig
archivemailagent
KPim6::AkonadiCore
KF6::XmlGui
@@ -117,5 +135,7 @@ target_link_libraries(archivemailagentconfig
# set_target_properties(archivemailagentconfig PROPERTIES UNITY_BUILD ON)
#endif()
-
-install(FILES settings/archivemailagentsettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
+install(
+ FILES settings/archivemailagentsettings.kcfg
+ DESTINATION ${KDE_INSTALL_KCFGDIR}
+)
diff --git a/agents/archivemailagent/akonadi_archivemail_agent.notifyrc b/agents/archivemailagent/akonadi_archivemail_agent.notifyrc
index 5140de1ea1..39cce8c483 100644
--- a/agents/archivemailagent/akonadi_archivemail_agent.notifyrc
+++ b/agents/archivemailagent/akonadi_archivemail_agent.notifyrc
@@ -330,4 +330,3 @@ Name[x-test]=xxArchive Mail Errorxx
Name[zh_CN]=邮件归档错误
Name[zh_TW]=封存郵件發生錯誤
Action=Popup
-
diff --git a/agents/archivemailagent/autotests/CMakeLists.txt b/agents/archivemailagent/autotests/CMakeLists.txt
index c30c1e89ff..631b27cc3f 100644
--- a/agents/archivemailagent/autotests/CMakeLists.txt
+++ b/agents/archivemailagent/autotests/CMakeLists.txt
@@ -1,36 +1,56 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/..
+ ${CMAKE_CURRENT_SOURCE_DIR}/../..
+)
ecm_qt_declare_logging_category(autotest_categories_SRCS HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME org.kde.pim.archivemailagent)
-
# Convenience macro to add unit tests.
macro(archivemail_agent _source)
- set(_test ${_source} ../widgets/hourcombobox.cpp
+ set(_test
+ ${_source}
+ ../widgets/hourcombobox.cpp
../archivemailrangewidget.cpp
../archivemailagentutil.cpp
../archivemailwidget.cpp
../addarchivemaildialog.cpp
../addarchivemailwidget.cpp
../widgets/formatcombobox.cpp
- ../widgets/unitcombobox.cpp ${autotest_categories_SRCS})
+ ../widgets/unitcombobox.cpp
+ ${autotest_categories_SRCS}
+ )
ki18n_wrap_ui(_test ../ui/archivemailwidget.ui)
get_filename_component(_name ${_source} NAME_WE)
add_executable(${_name} ${_test} ${_name}.h)
add_test(NAME ${_name} COMMAND ${_name})
ecm_mark_as_test(archivemailagent-${_name})
- target_link_libraries(${_name} archivemailagent Qt::Test Qt::Core KPim6::MailCommon KPim6::AkonadiCore KF6::XmlGui KF6::KIOWidgets KF6::I18n)
+ target_link_libraries(
+ ${_name}
+ archivemailagent
+ Qt::Test
+ Qt::Core
+ KPim6::MailCommon
+ KPim6::AkonadiCore
+ KF6::XmlGui
+ KF6::KIOWidgets
+ KF6::I18n
+ )
endmacro()
archivemail_agent(archivemailinfotest.cpp)
-set(_test2 ${_source} ../widgets/hourcombobox.cpp
+set(_test2
+ ${_source}
+ ../widgets/hourcombobox.cpp
../archivemailrangewidget.cpp
../archivemailagentutil.cpp
../archivemailwidget.cpp
../addarchivemaildialog.cpp
../addarchivemailwidget.cpp
../widgets/formatcombobox.cpp
- ../widgets/unitcombobox.cpp ${autotest_categories_SRCS})
+ ../widgets/unitcombobox.cpp
+ ${autotest_categories_SRCS}
+)
ki18n_wrap_ui(_test2 ../ui/archivemailwidget.ui)
add_akonadi_isolated_test_advanced(archivemailwidgettest.cpp "${_test2}" "archivemailagent;Qt::Test;Qt::Core;KPim6::MailCommon;KPim6::AkonadiCore;KF6::XmlGui;KF6::KIOWidgets;KF6::I18n")
archivemail_agent(formatcomboboxtest.cpp)
diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt
index 19b512bf3b..5348aa34f9 100644
--- a/agents/followupreminderagent/CMakeLists.txt
+++ b/agents/followupreminderagent/CMakeLists.txt
@@ -5,8 +5,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_followupreminder_agent\")
add_library(followupreminderagent STATIC)
set_property(TARGET followupreminderagent PROPERTY POSITION_INDEPENDENT_CODE ON)
-
-
kconfig_add_kcfg_files(followupreminderagent
followupreminderagentsettings.kcfgc
)
@@ -22,33 +20,34 @@ qt_add_dbus_adaptor(followupreminderagent_SRCS org.freedesktop.Akonadi.FollowUpR
qt_add_dbus_interface(followupreminderagent_SRCS org.freedesktop.Notifications.xml notifications_interface)
qt_add_dbus_interface(followupreminderagent_SRCS org.freedesktop.DBus.Properties.xml dbusproperties)
-target_sources(followupreminderagent PRIVATE
- followupremindermanager.cpp
- followupremindernoanswerdialog.cpp
- followupreminderinfowidget.cpp
- followupreminderinfo.cpp
- followupreminderutil.cpp
- jobs/followupreminderjob.cpp
- jobs/followupreminderfinishtaskjob.cpp
- jobs/followupremindershowmessagejob.cpp
-
- followupremindermanager.h
- followupremindernoanswerdialog.h
- followupreminderinfowidget.h
- followupreminderinfo.h
- followupreminderutil.h
- jobs/followupreminderjob.h
- jobs/followupreminderfinishtaskjob.h
- jobs/followupremindershowmessagejob.h
-
- ${followupreminderagent_SRCS}
+target_sources(
+ followupreminderagent
+ PRIVATE
+ followupremindermanager.cpp
+ followupremindernoanswerdialog.cpp
+ followupreminderinfowidget.cpp
+ followupreminderinfo.cpp
+ followupreminderutil.cpp
+ jobs/followupreminderjob.cpp
+ jobs/followupreminderfinishtaskjob.cpp
+ jobs/followupremindershowmessagejob.cpp
+ followupremindermanager.h
+ followupremindernoanswerdialog.h
+ followupreminderinfowidget.h
+ followupreminderinfo.h
+ followupreminderutil.h
+ jobs/followupreminderjob.h
+ jobs/followupreminderfinishtaskjob.h
+ jobs/followupremindershowmessagejob.h
+ ${followupreminderagent_SRCS}
)
#if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
# set_target_properties(followupreminderagent PROPERTIES UNITY_BUILD ON)
#endif()
-target_link_libraries(followupreminderagent
+target_link_libraries(
+ followupreminderagent
KPim6::AkonadiCore
KPim6::IdentityManagementCore
KPim6::AkonadiMime
@@ -62,11 +61,15 @@ target_link_libraries(followupreminderagent
KF6::CalendarCore
)
-
########################### Agent executable ################################
-add_executable(akonadi_followupreminder_agent followupreminderagent.cpp followupreminderagent.h)
+add_executable(
+ akonadi_followupreminder_agent
+ followupreminderagent.cpp
+ followupreminderagent.h
+)
-target_link_libraries(akonadi_followupreminder_agent
+target_link_libraries(
+ akonadi_followupreminder_agent
followupreminderagent
KPim6::AkonadiCore
KPim6::AkonadiMime
@@ -82,20 +85,41 @@ target_link_libraries(akonadi_followupreminder_agent
)
if(APPLE)
- set_target_properties(akonadi_followupreminder_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${kmail_SOURCE_DIR}/agents/Info.plist.template)
- set_target_properties(akonadi_followupreminder_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.akonadi_followupreminder_agent")
- set_target_properties(akonadi_followupreminder_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Followup Reminder Agent")
+ set_target_properties(
+ akonadi_followupreminder_agent
+ PROPERTIES
+ MACOSX_BUNDLE_INFO_PLIST
+ ${kmail_SOURCE_DIR}/agents/Info.plist.template
+ )
+ set_target_properties(
+ akonadi_followupreminder_agent
+ PROPERTIES
+ MACOSX_BUNDLE_GUI_IDENTIFIER "org.akonadi_followupreminder_agent"
+ )
+ set_target_properties(
+ akonadi_followupreminder_agent
+ PROPERTIES
+ MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Followup Reminder Agent"
+ )
endif()
-install(TARGETS akonadi_followupreminder_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+ TARGETS akonadi_followupreminder_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+)
-install(FILES followupreminder.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents")
+install(
+ FILES followupreminder.desktop
+ DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents"
+)
if(BUILD_TESTING)
add_subdirectory(autotests)
endif()
-install(FILES akonadi_followupreminder_agent.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
+install(
+ FILES akonadi_followupreminder_agent.notifyrc
+ DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR}
+)
########## Configuration ##############
@@ -108,7 +132,8 @@ kcoreaddons_add_plugin(followupreminderagentconfig
SOURCES ${followupreminderagentconfig_SRCS}
INSTALL_NAMESPACE pim6/akonadi/config
)
-target_link_libraries(followupreminderagentconfig
+target_link_libraries(
+ followupreminderagentconfig
followupreminderagent
KPim6::AkonadiCore
KF6::XmlGui
diff --git a/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc b/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc
index 8eeff3ed92..a6f42ae37d 100644
--- a/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc
+++ b/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc
@@ -98,4 +98,3 @@ Name[x-test]=xxMail Follow Up Receivedxx
Name[zh_CN]=收到的后续邮件
Name[zh_TW]=接收到回覆郵件
Action=Popup
-
diff --git a/agents/followupreminderagent/autotests/CMakeLists.txt b/agents/followupreminderagent/autotests/CMakeLists.txt
index 23afd98424..507ed2eda8 100644
--- a/agents/followupreminderagent/autotests/CMakeLists.txt
+++ b/agents/followupreminderagent/autotests/CMakeLists.txt
@@ -7,13 +7,17 @@ ecm_qt_declare_logging_category(autotest_categories_followupreminderagent_SRCS H
# Convenience macro to add unit tests.
macro(followupreminder_agent _source)
- set(_test ${_source} ${followupreminderagent_test_SRCS} ${autotest_categories_followupreminderagent_SRCS})
+ set(_test
+ ${_source}
+ ${followupreminderagent_test_SRCS}
+ ${autotest_categories_followupreminderagent_SRCS}
+ )
get_filename_component(_name ${_source} NAME_WE)
ecm_add_test(${_test} ${_name}.h
TEST_NAME ${_name}
NAME_PREFIX "followupreminder-"
LINK_LIBRARIES followupreminderagent Qt::Test KPim6::AkonadiCore Qt::Widgets KF6::I18n KF6::XmlGui KF6::Service
-)
+ )
endmacro()
followupreminder_agent(followupreminderinfotest.cpp)
diff --git a/agents/followupreminderagent/followupreminderagentsettings.kcfgc b/agents/followupreminderagent/followupreminderagentsettings.kcfgc
index 1d1cca7831..b6ee069a40 100644
--- a/agents/followupreminderagent/followupreminderagentsettings.kcfgc
+++ b/agents/followupreminderagent/followupreminderagentsettings.kcfgc
@@ -3,4 +3,3 @@ File=followupreminderagentsettings.kcfg
ClassName=FollowUpReminderAgentSettings
Singleton=true
Mutators=true
-
diff --git a/agents/mailfilteragent/CMakeLists.txt b/agents/mailfilteragent/CMakeLists.txt
index 3cb59aef73..15793a3798 100644
--- a/agents/mailfilteragent/CMakeLists.txt
+++ b/agents/mailfilteragent/CMakeLists.txt
@@ -5,14 +5,14 @@ add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_mailfilter_agent\")
add_library(mailfilteragentprivate)
-
-target_sources(mailfilteragentprivate PRIVATE
- filterlogdialog.cpp
- filterlogdialog.h
- mailfilterpurposemenuwidget.cpp
- mailfilterpurposemenuwidget.h
-
- mailfilteragent_private_export.h
+target_sources(
+ mailfilteragentprivate
+ PRIVATE
+ filterlogdialog.cpp
+ filterlogdialog.h
+ mailfilterpurposemenuwidget.cpp
+ mailfilterpurposemenuwidget.h
+ mailfilteragent_private_export.h
)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
@@ -20,7 +20,8 @@ if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
endif()
generate_export_header(mailfilteragentprivate BASE_NAME mailfilteragentprivate)
-target_link_libraries(mailfilteragentprivate
+target_link_libraries(
+ mailfilteragentprivate
KF6::I18n
Qt::Widgets
KF6::TextCustomEditor
@@ -28,48 +29,67 @@ target_link_libraries(mailfilteragentprivate
KPim6::MailCommon
)
-set_target_properties(mailfilteragentprivate
- PROPERTIES OUTPUT_NAME mailfilteragentprivate VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION}
+set_target_properties(
+ mailfilteragentprivate
+ PROPERTIES
+ OUTPUT_NAME mailfilteragentprivate
+ VERSION ${KDEPIM_LIB_VERSION}
+ SOVERSION ${KDEPIM_LIB_SOVERSION}
+)
+install(
+ TARGETS mailfilteragentprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+ LIBRARY NAMELINK_SKIP
)
-install(TARGETS mailfilteragentprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
-
add_executable(akonadi_mailfilter_agent)
set(dbusobjectmanager_xml org.freedesktop.Akonadi.MailFilterAgent.xml)
-set_source_files_properties(${dbusobjectmanager_xml} PROPERTIES INCLUDE "dbusoperators.h")
+set_source_files_properties(
+ ${dbusobjectmanager_xml}
+ PROPERTIES INCLUDE "dbusoperators.h"
+)
qt_add_dbus_adaptor(akonadi_mailfilter_agent_SRCS ${dbusobjectmanager_xml} mailfilteragent.h MailFilterAgent)
-target_sources(akonadi_mailfilter_agent PRIVATE
- dummykernel.cpp
- filtermanager.cpp
- mailfilteragent.cpp
- dummykernel.h
- filtermanager.h
- mailfilteragent.h
- ${akonadi_mailfilter_agent_SRCS}
+target_sources(
+ akonadi_mailfilter_agent
+ PRIVATE
+ dummykernel.cpp
+ filtermanager.cpp
+ mailfilteragent.cpp
+ dummykernel.h
+ filtermanager.h
+ mailfilteragent.h
+ ${akonadi_mailfilter_agent_SRCS}
)
-
-
ecm_qt_declare_logging_category(akonadi_mailfilter_agent HEADER mailfilteragent_debug.h IDENTIFIER MAILFILTERAGENT_LOG CATEGORY_NAME org.kde.pim.mailfilteragent
DESCRIPTION "kmail (mailfilter agent)"
OLD_CATEGORY_NAMES log_mailfilteragent
EXPORT KMAIL
)
-
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(akonadi_mailfilter_agent PROPERTIES UNITY_BUILD ON)
endif()
if(APPLE)
- set_target_properties(akonadi_mailfilter_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${kmail_SOURCE_DIR}/agents/Info.plist.template)
- set_target_properties(akonadi_mailfilter_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.mailfilter")
- set_target_properties(akonadi_mailfilter_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Email Filter")
+ set_target_properties(
+ akonadi_mailfilter_agent
+ PROPERTIES
+ MACOSX_BUNDLE_INFO_PLIST
+ ${kmail_SOURCE_DIR}/agents/Info.plist.template
+ )
+ set_target_properties(
+ akonadi_mailfilter_agent
+ PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.mailfilter"
+ )
+ set_target_properties(
+ akonadi_mailfilter_agent
+ PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Email Filter"
+ )
endif()
-
-target_link_libraries(akonadi_mailfilter_agent
+target_link_libraries(
+ akonadi_mailfilter_agent
KPim6::MailCommon
KPim6::MessageComposer
KPim6::PimCommon
@@ -86,7 +106,13 @@ target_link_libraries(akonadi_mailfilter_agent
)
install(TARGETS akonadi_mailfilter_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES mailfilteragent.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents")
-install(FILES akonadi_mailfilter_agent.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
+install(
+ FILES mailfilteragent.desktop
+ DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents"
+)
+install(
+ FILES akonadi_mailfilter_agent.notifyrc
+ DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR}
+)
add_subdirectory(tests)
diff --git a/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc b/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc
index 9d8b4deda2..26900e994b 100644
--- a/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc
+++ b/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc
@@ -160,7 +160,7 @@ Name[sv]=Postfiltreringslogg aktiverad
Name[ta]=அஞ்சல்களை வடிகட்டும்போது பதிவிடல் இயக்கப்பட்டது
Name[tr]=Posta süzgeç günlüğü etkin
Name[uk]=Увімкнено журнал фільтрування пошти
-Name[wa]=Djournålijhaedje del passete d' emile
+Name[wa]=Djournålijhaedje del passete d' emile
Name[x-test]=xxMail filter log enabledxx
Name[zh_CN]=邮件过滤器日志已启用
Name[zh_TW]=郵件過濾紀錄已開啟
diff --git a/agents/mailfilteragent/tests/filterlogdialog/CMakeLists.txt b/agents/mailfilteragent/tests/filterlogdialog/CMakeLists.txt
index 120f1275b2..26121f182d 100644
--- a/agents/mailfilteragent/tests/filterlogdialog/CMakeLists.txt
+++ b/agents/mailfilteragent/tests/filterlogdialog/CMakeLists.txt
@@ -2,7 +2,8 @@
# SPDX-License-Identifier: BSD-3-Clause
add_executable(filterlogdialog_gui filterlogdialog_gui.cpp)
-target_link_libraries(filterlogdialog_gui
+target_link_libraries(
+ filterlogdialog_gui
mailfilteragentprivate
KPim6::MailCommon
)
diff --git a/agents/mailfilteragent/tests/mailfilteragentdbus/CMakeLists.txt b/agents/mailfilteragent/tests/mailfilteragentdbus/CMakeLists.txt
index 883d6d74a5..e74684afd6 100644
--- a/agents/mailfilteragent/tests/mailfilteragentdbus/CMakeLists.txt
+++ b/agents/mailfilteragent/tests/mailfilteragentdbus/CMakeLists.txt
@@ -1,19 +1,23 @@
# SPDX-FileCopyrightText: 2023-2025 Laurent Montel <montel at kde.org>
# SPDX-License-Identifier: BSD-3-Clause
-
set(dbusobjectmanager_xml ../../org.freedesktop.Akonadi.MailFilterAgent.xml)
-set_source_files_properties(${dbusobjectmanager_xml} PROPERTIES INCLUDE "../../dbusoperators.h")
+set_source_files_properties(
+ ${dbusobjectmanager_xml}
+ PROPERTIES INCLUDE "../../dbusoperators.h"
+)
qt_add_dbus_interfaces(mailagentdbus_gui_SRCS ${dbusobjectmanager_xml})
-
-add_executable(mailagentdbus_gui mailagentdbus_gui.cpp
+add_executable(
+ mailagentdbus_gui
+ mailagentdbus_gui.cpp
mailagentdbuswidget.h
mailagentdbuswidget.cpp
${mailagentdbus_gui_SRCS}
)
-target_link_libraries(mailagentdbus_gui
+target_link_libraries(
+ mailagentdbus_gui
mailfilteragentprivate
KPim6::MailCommon
)
diff --git a/agents/mailfilteragent/tests/test_dbus_interface/CMakeLists.txt b/agents/mailfilteragent/tests/test_dbus_interface/CMakeLists.txt
index a53ea47365..5ce44602fe 100644
--- a/agents/mailfilteragent/tests/test_dbus_interface/CMakeLists.txt
+++ b/agents/mailfilteragent/tests/test_dbus_interface/CMakeLists.txt
@@ -6,31 +6,26 @@
set(dbusservermanager_xml org.freedesktop.test.dbus.xml)
qt_add_dbus_adaptor(serverdbuswidget_SRCS ${dbusservermanager_xml} serverdbuswidget.h ServerDbusWidget)
-add_executable(serverdbus_gui serverdbus_gui.cpp
+add_executable(
+ serverdbus_gui
+ serverdbus_gui.cpp
serverdbuswidget.h
serverdbuswidget.cpp
${serverdbuswidget_SRCS}
)
-target_link_libraries(serverdbus_gui
- Qt::Gui
- Qt::Widgets
- Qt::DBus
-)
-
+target_link_libraries(serverdbus_gui Qt::Gui Qt::Widgets Qt::DBus)
#client
set(dbusclientmanager_xml org.freedesktop.test.dbus.xml)
qt_add_dbus_interfaces(clientdbus_gui_SRCS ${dbusclientmanager_xml})
-add_executable(clientdbus_gui clientdbus_gui.cpp
+add_executable(
+ clientdbus_gui
+ clientdbus_gui.cpp
clientdbuswidget.h
clientdbuswidget.cpp
${clientdbus_gui_SRCS}
)
-target_link_libraries(clientdbus_gui
- Qt::Gui
- Qt::Widgets
- Qt::DBus
-)
+target_link_libraries(clientdbus_gui Qt::Gui Qt::Widgets Qt::DBus)
diff --git a/agents/mailmergeagent/CMakeLists.txt b/agents/mailmergeagent/CMakeLists.txt
index 40bb2c610d..331908ba71 100644
--- a/agents/mailmergeagent/CMakeLists.txt
+++ b/agents/mailmergeagent/CMakeLists.txt
@@ -9,7 +9,6 @@ endif()
add_library(mailmergeagent STATIC)
set_property(TARGET mailmergeagent PROPERTY POSITION_INDEPENDENT_CODE ON)
-
ecm_qt_declare_logging_category(mailmergeagent HEADER mailmergeagent_debug.h IDENTIFIER MAILMERGEAGENT_LOG CATEGORY_NAME org.kde.pim.mailmergeagent
DESCRIPTION "kmail (mailmergeagent)"
OLD_CATEGORY_NAMES log_mailmergeagent
@@ -20,18 +19,20 @@ qt_add_dbus_adaptor(mailmergeagent_SRCS org.freedesktop.Akonadi.MailMergeAgent.x
ki18n_wrap_ui(mailmergeagent ui/mailmergeconfigurewidget.ui)
-target_sources(mailmergeagent PRIVATE
- mailmergeagent.cpp
- mailmergemanager.cpp
- mailmergeconfiguredialog.cpp
- mailmergeconfigurewidget.cpp
- mailmergeutil.cpp
- mailmergeagent.h
- mailmergemanager.h
- mailmergeconfiguredialog.h
- mailmergeconfigurewidget.h
- mailmergeutil.h
- ${mailmergeagent_SRCS}
+target_sources(
+ mailmergeagent
+ PRIVATE
+ mailmergeagent.cpp
+ mailmergemanager.cpp
+ mailmergeconfiguredialog.cpp
+ mailmergeconfigurewidget.cpp
+ mailmergeutil.cpp
+ mailmergeagent.h
+ mailmergemanager.h
+ mailmergeconfiguredialog.h
+ mailmergeconfigurewidget.h
+ mailmergeutil.h
+ ${mailmergeagent_SRCS}
)
kconfig_add_kcfg_files(mailmergeagent mailmergeagentsettings.kcfgc)
@@ -39,7 +40,8 @@ kconfig_add_kcfg_files(mailmergeagent mailmergeagentsettings.kcfgc)
# set_target_properties(sendlateragent PROPERTIES UNITY_BUILD ON)
#endif()
-target_link_libraries(mailmergeagent
+target_link_libraries(
+ mailmergeagent
KPim6::AkonadiCore
KPim6::AkonadiMime
#KPim6::Mime
@@ -54,22 +56,35 @@ target_link_libraries(mailmergeagent
)
add_executable(akonadi_mailmerge_agent)
-target_link_libraries(akonadi_mailmerge_agent
+target_link_libraries(
+ akonadi_mailmerge_agent
mailmergeagent
KPim6::AkonadiAgentBase
)
-
-
if(APPLE)
- set_target_properties(akonadi_mailmerge_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${kmail_SOURCE_DIR}/agents/Info.plist.template)
- set_target_properties(akonadi_mailmerge_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Mail Merge")
+ set_target_properties(
+ akonadi_mailmerge_agent
+ PROPERTIES
+ MACOSX_BUNDLE_INFO_PLIST
+ ${kmail_SOURCE_DIR}/agents/Info.plist.template
+ )
+ set_target_properties(
+ akonadi_mailmerge_agent
+ PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Mail Merge"
+ )
endif()
install(TARGETS akonadi_mailmerge_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES mailmergeagent.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents")
-install(FILES akonadi_mailmerge_agent.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
+install(
+ FILES mailmergeagent.desktop
+ DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents"
+)
+install(
+ FILES akonadi_mailmerge_agent.notifyrc
+ DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR}
+)
#kcoreaddons_add_plugin(mailmergeagentconfig
# SOURCES ${mailmergeagentconfig_SRCS}
diff --git a/agents/mailmergeagent/autotests/CMakeLists.txt b/agents/mailmergeagent/autotests/CMakeLists.txt
index 37aab27f9a..e0c869aef8 100644
--- a/agents/mailmergeagent/autotests/CMakeLists.txt
+++ b/agents/mailmergeagent/autotests/CMakeLists.txt
@@ -8,5 +8,5 @@ macro(mailmerge_agent _source)
TEST_NAME ${_name}
NAME_PREFIX "mailmerge-"
LINK_LIBRARIES mailmergeagent Qt::Test KPim6::AkonadiCore Qt::Widgets KF6::I18n KF6::XmlGui KF6::Service
-)
+ )
endmacro()
diff --git a/agents/mailmergeagent/mailmergeagentsettings.kcfgc b/agents/mailmergeagent/mailmergeagentsettings.kcfgc
index 45abb02991..cc361754f0 100644
--- a/agents/mailmergeagent/mailmergeagentsettings.kcfgc
+++ b/agents/mailmergeagent/mailmergeagentsettings.kcfgc
@@ -3,4 +3,3 @@ File=mailmergeagentsettings.kcfg
ClassName=MailMergeAgentSettings
Singleton=true
Mutators=true
-
diff --git a/agents/sendlateragent/CMakeLists.txt b/agents/sendlateragent/CMakeLists.txt
index 6daca7f0fd..f368103c1a 100644
--- a/agents/sendlateragent/CMakeLists.txt
+++ b/agents/sendlateragent/CMakeLists.txt
@@ -14,7 +14,6 @@ ecm_qt_declare_logging_category(sendlater_common_SRCS HEADER sendlateragent_debu
EXPORT KMAIL
)
-
set(libsendlateragent_SRCS
sendlaterconfigurewidget.cpp
sendlatermanager.cpp
@@ -27,14 +26,10 @@ set(libsendlateragent_SRCS
${sendlater_common_SRCS}
)
-set(sendlateragent_SRCS
- sendlateragent.cpp
- sendlateragent.h
-)
+set(sendlateragent_SRCS sendlateragent.cpp sendlateragent.h)
qt_add_dbus_adaptor(sendlateragent_SRCS org.freedesktop.Akonadi.SendLaterAgent.xml sendlateragent.h SendLaterAgent)
-
ki18n_wrap_ui(libsendlateragent_SRCS ui/sendlaterconfigurewidget.ui)
kconfig_add_kcfg_files(libsendlateragent_SRCS sendlateragentsettings.kcfgc)
add_library(sendlateragent STATIC ${libsendlateragent_SRCS})
@@ -44,7 +39,8 @@ set_property(TARGET sendlateragent PROPERTY POSITION_INDEPENDENT_CODE ON)
# set_target_properties(sendlateragent PROPERTIES UNITY_BUILD ON)
#endif()
-target_link_libraries(sendlateragent
+target_link_libraries(
+ sendlateragent
KPim6::AkonadiCore
KPim6::AkonadiMime
KPim6::MailTransport
@@ -59,23 +55,36 @@ target_link_libraries(sendlateragent
KF6::I18n
)
-
add_executable(akonadi_sendlater_agent ${sendlateragent_SRCS})
-target_link_libraries(akonadi_sendlater_agent
+target_link_libraries(
+ akonadi_sendlater_agent
sendlateragent
KPim6::AkonadiAgentWidgetBase
)
if(APPLE)
- set_target_properties(akonadi_sendlater_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${kmail_SOURCE_DIR}/agents/Info.plist.template)
- set_target_properties(akonadi_sendlater_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Send Later")
+ set_target_properties(
+ akonadi_sendlater_agent
+ PROPERTIES
+ MACOSX_BUNDLE_INFO_PLIST
+ ${kmail_SOURCE_DIR}/agents/Info.plist.template
+ )
+ set_target_properties(
+ akonadi_sendlater_agent
+ PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Send Later"
+ )
endif()
install(TARGETS akonadi_sendlater_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES sendlateragent.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents")
-install(FILES akonadi_sendlater_agent.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
-
+install(
+ FILES sendlateragent.desktop
+ DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents"
+)
+install(
+ FILES akonadi_sendlater_agent.notifyrc
+ DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR}
+)
########## Configuration ##############
@@ -90,10 +99,10 @@ kcoreaddons_add_plugin(sendlateragentconfig
SOURCES ${sendlateragentconfig_SRCS}
INSTALL_NAMESPACE pim6/akonadi/config
)
-target_link_libraries(sendlateragentconfig
+target_link_libraries(
+ sendlateragentconfig
sendlateragent
KPim6::AkonadiCore
KF6::XmlGui
KF6::I18n
)
-
diff --git a/agents/sendlateragent/akonadi_sendlater_agent.notifyrc b/agents/sendlateragent/akonadi_sendlater_agent.notifyrc
index 0a8f995d8a..98507c38f7 100644
--- a/agents/sendlateragent/akonadi_sendlater_agent.notifyrc
+++ b/agents/sendlateragent/akonadi_sendlater_agent.notifyrc
@@ -159,4 +159,3 @@ Name[x-test]=xxSend mail failedxx
Name[zh_CN]=邮件发送失败
Name[zh_TW]=傳送郵件失敗
Action=Popup
-
diff --git a/agents/sendlateragent/autotests/CMakeLists.txt b/agents/sendlateragent/autotests/CMakeLists.txt
index bc3c149819..63022d8a95 100644
--- a/agents/sendlateragent/autotests/CMakeLists.txt
+++ b/agents/sendlateragent/autotests/CMakeLists.txt
@@ -7,7 +7,7 @@ macro(add_sendlater_agent_test _source)
TEST_NAME ${_name}
NAME_PREFIX "sendlateragent-"
LINK_LIBRARIES sendlateragent Qt::Test
-)
+ )
endmacro()
add_sendlater_agent_test(sendlaterutiltest.cpp)
diff --git a/agents/sendlateragent/tests/CMakeLists.txt b/agents/sendlateragent/tests/CMakeLists.txt
index 8577a050b3..c55507221a 100644
--- a/agents/sendlateragent/tests/CMakeLists.txt
+++ b/agents/sendlateragent/tests/CMakeLists.txt
@@ -2,6 +2,4 @@
# SPDX-License-Identifier: BSD-3-Clause
set(sendlaterinfo_gui_SRCS sendlaterinfo_gui.cpp)
add_executable(sendlaterinfo_gui ${sendlaterinfo_gui_SRCS})
-target_link_libraries(sendlaterinfo_gui
- sendlateragent
-)
+target_link_libraries(sendlaterinfo_gui sendlateragent)
diff --git a/agents/unifiedmailboxagent/CMakeLists.txt b/agents/unifiedmailboxagent/CMakeLists.txt
index 14ce0f7cf2..9ed4183d57 100644
--- a/agents/unifiedmailboxagent/CMakeLists.txt
+++ b/agents/unifiedmailboxagent/CMakeLists.txt
@@ -6,7 +6,6 @@ if(BUILD_TESTING)
add_subdirectory(autotests)
endif()
-
add_executable(akonadi_unifiedmailbox_agent)
ecm_qt_declare_logging_category(akonadi_unifiedmailbox_agent HEADER unifiedmailboxagent_debug.h IDENTIFIER UNIFIEDMAILBOXAGENT_LOG CATEGORY_NAME org.kde.pim.unifiedmailboxagent
DESCRIPTION "kmail (unifiedmailboxagent)"
@@ -18,26 +17,29 @@ kconfig_add_kcfg_files(akonadi_unifiedmailbox_agent
)
qt_add_dbus_adaptor(unifiedmailbox_agent_SRCS org.freedesktop.Akonadi.UnifiedMailboxAgent.xml unifiedmailboxagent.h UnifiedMailboxAgent)
-target_sources(akonadi_unifiedmailbox_agent PRIVATE
- unifiedmailbox.cpp
- unifiedmailboxagent.cpp
- unifiedmailboxmanager.cpp
- unifiedmailboxeditor.cpp
- settingsdialog.cpp
- mailkernel.cpp
- unifiedmailbox.h
- unifiedmailboxagent.h
- unifiedmailboxmanager.h
- unifiedmailboxeditor.h
- settingsdialog.h
- mailkernel.h
- ${unifiedmailbox_agent_SRCS}
+target_sources(
+ akonadi_unifiedmailbox_agent
+ PRIVATE
+ unifiedmailbox.cpp
+ unifiedmailboxagent.cpp
+ unifiedmailboxmanager.cpp
+ unifiedmailboxeditor.cpp
+ settingsdialog.cpp
+ mailkernel.cpp
+ unifiedmailbox.h
+ unifiedmailboxagent.h
+ unifiedmailboxmanager.h
+ unifiedmailboxeditor.h
+ settingsdialog.h
+ mailkernel.h
+ ${unifiedmailbox_agent_SRCS}
)
#if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
# set_target_properties(akonadi_unifiedmailbox_agent PROPERTIES UNITY_BUILD ON)
#endif()
-target_link_libraries(akonadi_unifiedmailbox_agent
+target_link_libraries(
+ akonadi_unifiedmailbox_agent
KPim6::AkonadiAgentWidgetBase
KPim6::AkonadiMime
KPim6::Mime
@@ -52,13 +54,28 @@ target_link_libraries(akonadi_unifiedmailbox_agent
)
if(APPLE)
- set_target_properties(akonadi_unifiedmailbox_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${kmail_SOURCE_DIR}/agents/Info.plist.template)
- set_target_properties(akonadi_unifiedmailbox_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.KF6::UnifiedMailbox")
- set_target_properties(akonadi_unifiedmailbox_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE PIM Unified Mailbox")
+ set_target_properties(
+ akonadi_unifiedmailbox_agent
+ PROPERTIES
+ MACOSX_BUNDLE_INFO_PLIST
+ ${kmail_SOURCE_DIR}/agents/Info.plist.template
+ )
+ set_target_properties(
+ akonadi_unifiedmailbox_agent
+ PROPERTIES
+ MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.KF6::UnifiedMailbox"
+ )
+ set_target_properties(
+ akonadi_unifiedmailbox_agent
+ PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE PIM Unified Mailbox"
+ )
endif()
-install(TARGETS akonadi_unifiedmailbox_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-
-install(FILES unifiedmailboxagent.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents")
-
+install(
+ TARGETS akonadi_unifiedmailbox_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+)
+install(
+ FILES unifiedmailboxagent.desktop
+ DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents"
+)
diff --git a/agents/unifiedmailboxagent/autotests/CMakeLists.txt b/agents/unifiedmailboxagent/autotests/CMakeLists.txt
index 8df106d919..dfe41960f3 100644
--- a/agents/unifiedmailboxagent/autotests/CMakeLists.txt
+++ b/agents/unifiedmailboxagent/autotests/CMakeLists.txt
@@ -1,8 +1,6 @@
# SPDX-FileCopyrightText: none
# SPDX-License-Identifier: BSD-3-Clause
-set(common_SRCS
- ${CMAKE_CURRENT_BINARY_DIR}/../unifiedmailboxagent_debug.cpp
-)
+set(common_SRCS ${CMAKE_CURRENT_BINARY_DIR}/../unifiedmailboxagent_debug.cpp)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
add_definitions(-DUNIT_TESTS)
diff --git a/agents/unifiedmailboxagent/autotests/unittestenv/xdgconfig/akonadi_knut_resource_0rc b/agents/unifiedmailboxagent/autotests/unittestenv/xdgconfig/akonadi_knut_resource_0rc
index 0d9e3cfe54..04913c76be 100644
--- a/agents/unifiedmailboxagent/autotests/unittestenv/xdgconfig/akonadi_knut_resource_0rc
+++ b/agents/unifiedmailboxagent/autotests/unittestenv/xdgconfig/akonadi_knut_resource_0rc
@@ -1,4 +1,3 @@
[General]
DataFile[$e]=$XDG_DATA_HOME/testdata-res1.xml
FileWatchingEnabled=false
-
diff --git a/agents/unifiedmailboxagent/autotests/unittestenv/xdgconfig/akonadi_knut_resource_1rc b/agents/unifiedmailboxagent/autotests/unittestenv/xdgconfig/akonadi_knut_resource_1rc
index d39b82877e..87df3c69e8 100644
--- a/agents/unifiedmailboxagent/autotests/unittestenv/xdgconfig/akonadi_knut_resource_1rc
+++ b/agents/unifiedmailboxagent/autotests/unittestenv/xdgconfig/akonadi_knut_resource_1rc
@@ -1,5 +1,3 @@
[General]
DataFile[$e]=$XDG_DATA_HOME/testdata-res2.xml
FileWatchingEnabled=false
-
-
diff --git a/agents/unifiedmailboxagent/autotests/unittestenv/xdglocal/testdata-res2.xml b/agents/unifiedmailboxagent/autotests/unittestenv/xdglocal/testdata-res2.xml
index 4deeb07f99..7a054683fb 100644
--- a/agents/unifiedmailboxagent/autotests/unittestenv/xdglocal/testdata-res2.xml
+++ b/agents/unifiedmailboxagent/autotests/unittestenv/xdglocal/testdata-res2.xml
@@ -43,4 +43,3 @@
</collection>
</collection>
</knut>
-
diff --git a/agents/unifiedmailboxagent/autotests/unittestenv/xdglocal/testdata-res3.xml b/agents/unifiedmailboxagent/autotests/unittestenv/xdglocal/testdata-res3.xml
index 937d98488d..33d30adbcd 100644
--- a/agents/unifiedmailboxagent/autotests/unittestenv/xdglocal/testdata-res3.xml
+++ b/agents/unifiedmailboxagent/autotests/unittestenv/xdglocal/testdata-res3.xml
@@ -4,5 +4,3 @@
<collection rid="akonadi_unifiedmailbox_agent" name="akonadi_unifiedmailbox_agent" content="inode/directory">
</collection>
</knut>
-
-
diff --git a/agents/unifiedmailboxagent/settings.kcfg b/agents/unifiedmailboxagent/settings.kcfg
index 24cb852c6b..a337c18f7e 100644
--- a/agents/unifiedmailboxagent/settings.kcfg
+++ b/agents/unifiedmailboxagent/settings.kcfg
@@ -15,4 +15,3 @@
</entry>
</group>
</kcfg>
-
diff --git a/config-enterprise.h.in b/config-enterprise.h.in
index ad51ff6a07..856f9cba8c 100644
--- a/config-enterprise.h.in
+++ b/config-enterprise.h.in
@@ -1,2 +1 @@
#cmakedefine01 KDEPIM_ENTERPRISE_BUILD
-
diff --git a/doc/akonadi_archivemail_agent/index.docbook b/doc/akonadi_archivemail_agent/index.docbook
index 28f549e7f0..d7adf13ee8 100644
--- a/doc/akonadi_archivemail_agent/index.docbook
+++ b/doc/akonadi_archivemail_agent/index.docbook
@@ -3,7 +3,7 @@
"dtd/kdedbx45.dtd" [
<!ENTITY i18n-archivemailagent "<application>Archive Mail Agent</application>">
<!ENTITY % addindex "IGNORE">
- <!ENTITY % English "INCLUDE">
+ <!ENTITY % English "INCLUDE">
]>
<article id="archivemailagent" lang="&language;">
@@ -72,22 +72,22 @@ the <guibutton>Add...</guibutton> button, and the <guilabel>Add Archive Mail</gu
<listitem><para>First select the folder you would like to archive.</para></listitem>
<listitem><para>Select the format you would like to save it in. ⪚ <literal role="extension">.tar.bz2</literal>
in the drop down list. The archive filename will consist of the prefix <userinput>Archive_</userinput>,
-the path of the selected folder in &kmail;'s folder list, the date in format <userinput>year-month-day</userinput>
+the path of the selected folder in &kmail;'s folder list, the date in format <userinput>year-month-day</userinput>
and the selected file extension ⪚ <filename>Archive_Local Folder_inbox_2019-09-03.tar.bz2</filename>.
</para></listitem>
-<listitem><para>By default <guilabel>Archive all subfolders</guilabel> is enabled.
+<listitem><para>By default <guilabel>Archive all subfolders</guilabel> is enabled.
Uncheck this if you only want the parent folder archived.</para></listitem>
-<listitem><para>You can type in the location you would like to save your archive, or click
+<listitem><para>You can type in the location you would like to save your archive, or click
the <guibutton>Open File Dialog</guibutton> button to select the folder.</para></listitem>
-<listitem><para>Select how often you wish to backup through the dropdown menus next to
+<listitem><para>Select how often you wish to backup through the dropdown menus next to
<guilabel>Backup each:</guilabel>.</para></listitem>
-<listitem><para>If you are limited on drive space you will want to set a limit on
+<listitem><para>If you are limited on drive space you will want to set a limit on
<guilabel>Maximum number of archive:</guilabel></para></listitem>
</itemizedlist>
<para>If you have added or modified an archive job it will be executed automatically after closing the dialog.
</para>
-<para>If you have already added mail archive jobs the <guilabel>Configure Archive Mail
+<para>If you have already added mail archive jobs the <guilabel>Configure Archive Mail
Agent</guilabel> dialog will list and allow to modify them.
</para>
<screenshot>
@@ -104,15 +104,15 @@ Agent</guilabel> dialog will list and allow to modify them.
</caption>
</mediaobject>
</screenshot>
-<para>You can use the checkbox at the left of each entry in the list to enable or disable
+<para>You can use the checkbox at the left of each entry in the list to enable or disable
archiving of this job.
</para>
<para>It is possible to access this configurational dialog any time later using <menuchoice><guimenu>Settings</guimenu>
<guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> then select the <guilabel>Plugins</guilabel> page in &kmail; main window and pressing
the configuration button against the <guilabel>Archive Mail Agent</guilabel> item.
</para>
-<para>Using the context menu launched with a &RMB; click on an archive job you can open the
-folder containing the archives or start the archive job immediately. This will overwrite an existing
+<para>Using the context menu launched with a &RMB; click on an archive job you can open the
+folder containing the archives or start the archive job immediately. This will overwrite an existing
archive created earlier at the same day without notification.
</para>
@@ -124,7 +124,7 @@ archive created earlier at the same day without notification.
<para>&i18n-archivemailagent;</para>
<para>
-Program copyright 2013-2019 Laurent Montel montel at kde.org
+Program copyright 2013-2019 Laurent Montel montel at kde.org
</para>
<para>
Documentation Copyright © 2013-2019 Laurent Montel montel at kde.org
diff --git a/doc/akonadi_followupreminder_agent/index.docbook b/doc/akonadi_followupreminder_agent/index.docbook
index 5f1bc62a09..b73883e1a7 100644
--- a/doc/akonadi_followupreminder_agent/index.docbook
+++ b/doc/akonadi_followupreminder_agent/index.docbook
@@ -3,7 +3,7 @@
"dtd/kdedbx45.dtd" [
<!ENTITY i18n-followupreminderagent "<application>Follow Up Reminder Agent</application>">
<!ENTITY % addindex "IGNORE">
- <!ENTITY % English "INCLUDE">
+ <!ENTITY % English "INCLUDE">
]>
<article id="followupreminder" lang="&language;">
@@ -41,7 +41,7 @@
<title>Using &i18n-followupreminderagent;</title>
<para>Use <menuchoice><guimenu>Options</guimenu><guimenuitem>Create Follow Up Reminder</guimenuitem></menuchoice>
-in &kmail;'s composer window to open a dialog which allows you to create a reminder to follow up your current email
+in &kmail;'s composer window to open a dialog which allows you to create a reminder to follow up your current email
at a specific date.</para>
<screenshot>
diff --git a/doc/akonadi_sendlater_agent/index.docbook b/doc/akonadi_sendlater_agent/index.docbook
index 27fd5f8d76..04f6768f11 100644
--- a/doc/akonadi_sendlater_agent/index.docbook
+++ b/doc/akonadi_sendlater_agent/index.docbook
@@ -3,7 +3,7 @@
"dtd/kdedbx45.dtd" [
<!ENTITY i18n-sendlateragent "<application>Send Later Agent</application>">
<!ENTITY % addindex "IGNORE">
- <!ENTITY % English "INCLUDE">
+ <!ENTITY % English "INCLUDE">
]>
<article id="sendlateragent" lang="&language;">
@@ -48,7 +48,7 @@
<title>Using &i18n-sendlateragent;</title>
<para>Use <menuchoice><guimenu>Message</guimenu><guimenuitem>Send Later</guimenuitem></menuchoice>
-in &kmail;'s composer window to open a dialog which allows you to schedule your emails to send
+in &kmail;'s composer window to open a dialog which allows you to schedule your emails to send
at a specific date and time.</para>
<screenshot>
@@ -78,7 +78,7 @@ checkbox and selecting the desired intervals.</para>
in online mode to send scheduled emails.</para>
<para>If you have no network connection when a scheduled message should be sent, the agent will report an error
and ask if you want to resend it later.</para>
-<para>At login to a &kde; session the agent checks the scheduled messages and sends all
+<para>At login to a &kde; session the agent checks the scheduled messages and sends all
messages overdue since the last logout if necessary.
</para>
<para>To change the options for emails you have scheduled to send later, use <menuchoice><guimenu>Settings</guimenu>
@@ -101,7 +101,7 @@ the configuration button against the <guilabel>Send Later Agent</guilabel> item.
</mediaobject>
</screenshot>
-<para><action>This brings up a dialog that allows you to modify the schedule and remove emails
+<para><action>This brings up a dialog that allows you to modify the schedule and remove emails
that have been sent using the send later feature.</action>
</para>
<para>It is not possible to change the content (body, headers &etc;) of a scheduled message.
diff --git a/doc/kmail2/configure.docbook b/doc/kmail2/configure.docbook
index 16b47c09a8..13d4f21b4a 100644
--- a/doc/kmail2/configure.docbook
+++ b/doc/kmail2/configure.docbook
@@ -125,7 +125,7 @@ the <link linkend="configure-generalinfo">Configure &kmail;</link> section above
<para> </para><!-- add whitespace -->
<sect2 id="configure-identities-tab">
-<title>Identities Tab</title>
+<title>Identities Tab</title>
<para>You can find a quick introduction to the
<guilabel>Identities</guilabel> tab in the <link
@@ -252,8 +252,8 @@ address</guilabel> field.</para></example>
<varlistentry>
<term><guilabel>Email aliases</guilabel></term>
<listitem>
-<para>This field contains alias addresses that also
-belong to this identity (as opposed to representing
+<para>This field contains alias addresses that also
+belong to this identity (as opposed to representing
a different identity). You may define multiple aliases. To add another
alias. enter an email address in the <guilabel>Email aliases:</guilabel>
field, then click the <guibutton>+ Add</guibutton> button</para>
@@ -300,7 +300,7 @@ To select an existing key, use the drop down list. If you wish to create a new p
<varlistentry id="configure-identity-cryptography-openpgp-encrypt">
<term><guilabel>OpenPGP encryption key:</guilabel></term>
-<listitem><para>Here you may select an &openpgp; key for encrypting messages when this identity and
+<listitem><para>Here you may select an &openpgp; key for encrypting messages when this identity and
<xref linkend="configure-security-composing-encrypt-to-self"/> are in effect. This key is also used for
the <xref linkend="composer-attach-attach-my-public-key"/> function.</para>
</listitem></varlistentry>
@@ -447,7 +447,7 @@ this identity. Please see <link linkend="new-compose-from-templates">Compose
from templates</link> for more information about templates.</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Outgoing Account:</guilabel></term>
<listitem>
@@ -479,10 +479,10 @@ message sent from this identity. A short dialog will ensue.</para>
<listitem><para>This option opens a browse directories dialog which
allows you to to select a .vcf file. (Hint: Use &kaddressbook;
to export a vCard file that can be used here.)</para></listitem>
- </varlistentry>
+ </varlistentry>
<varlistentry>
<term><guilabel>Duplicate existing vCard</guilabel></term>
- <listitem><para>This option opens a drop down list of all the other identities
+ <listitem><para>This option opens a drop down list of all the other identities
already defined, so you may select the vCard associated with one of them.</para></listitem>
</varlistentry>
</variablelist>
@@ -533,7 +533,7 @@ to any purely local email address you specify. This feature is primarily useful
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-<para>Here you may create and manage custom templates for this identity to use when composing new
+<para>Here you may create and manage custom templates for this identity to use when composing new
messages, replying to someone, or forwarding messages inline. The message templates support substitution
commands. You may simply type them in, or select them from the <guimenu>Insert Command <inlinemediaobject>
<imageobject><imagedata fileref="go-down.png" format="PNG"/></imageobject></inlinemediaobject></guimenu> menu.
@@ -545,13 +545,13 @@ Three kinds of commands are provided.</para>
<listitem><para>These commands extract information from the message you're replying to, or forwarding,
and insert that information into the composition window.</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Process with External Programs ></guilabel></term>
<listitem><para>These commands will pipe the message to which you are responding through an external
program, then insert the output into &kmail;'s composition window.</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Miscellaneous ></guilabel></term>
<listitem><para>These commands perform functions like choosing the dictionary the spell checker should
@@ -564,8 +564,8 @@ character ">". The <guibutton>Copy Global Templates</guibutton> button will r
templates defined here to &kmail;'s defaults. (You can achieve the same end result by unselecting the <guilabel>Use
custom message templates for this identity</guilabel> check box at the top left of this dialog box.)</para>
-<para>Templates specified here are identity-specific. They override global
-templates, but can be overridden by folder-specific templates if those are
+<para>Templates specified here are identity-specific. They override global
+templates, but can be overridden by folder-specific templates if those are
specified.</para>
<para> </para><!-- add whitespace -->
</sect2>
@@ -647,8 +647,8 @@ already present).</para></note>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-<para>&kmail; can send a small (48x48 pixels), low-quality, monochrome picture
-with every message. For example, this could be a picture of you, or a glyph.
+<para>&kmail; can send a small (48x48 pixels), low-quality, monochrome picture
+with every message. For example, this could be a picture of you, or a glyph.
It is shown in the recipient's mail client (if supported).</para>
<variablelist>
@@ -656,7 +656,7 @@ It is shown in the recipient's mail client (if supported).</para>
<term><guilabel>Send picture with every message</guilabel></term>
<listitem>
<para>Check this box if you want &kmail; to add a so-called X-Face header to
-messages written with this identity. An X-Face is a small (48x48 pixels)
+messages written with this identity. An X-Face is a small (48x48 pixels)
black and white image that some mail clients are able to display.</para>
</listitem>
</varlistentry>
@@ -676,19 +676,19 @@ fileref="go-down.png" format="PNG"/></imageobject></inlinemediaobject></guilabel
<varlistentry>
<term><guibutton>Select File...</guibutton></term>
<listitem>
-<para>Use this button to select an image file from which to create the picture. Use
-a high-contrast image that is square, or nearly square. A light background
+<para>Use this button to select an image file from which to create the picture. Use
+a high-contrast image that is square, or nearly square. A light background
helps improve the result.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><guibutton>Set From Address Book</guibutton></term>
<listitem>
-<para>You may use this button to create a scaled-down version of the picture you have set in your
+<para>You may use this button to create a scaled-down version of the picture you have set in your
own address book entry.</para>
</listitem>
</varlistentry>
-</variablelist>
+</variablelist>
</listitem>
</varlistentry>
@@ -704,7 +704,7 @@ Examples are available at <ulink url="https://ace.home.xs4all.nl/X-Faces/"
</variablelist>
<para> </para><!-- add whitespace -->
</sect2>
-
+
</sect1>
<sect1 id="configure-accounts">
@@ -758,9 +758,9 @@ simulate a program restart.</para>
lets you move any IMAP accounts you have created, and the group of accounts associated with
<guilabel>Local Folders</guilabel>, higher or lower in the list.</para>
-<para>The <guilabel>Retrieval Options</guilabel> popup menu for each account
-lets you specify whether &kmail; should check for new mail immediately after it has
-been started. You may also select <guilabel>Include in Manual Mail Check</guilabel>
+<para>The <guilabel>Retrieval Options</guilabel> popup menu for each account
+lets you specify whether &kmail; should check for new mail immediately after it has
+been started. You may also select <guilabel>Include in Manual Mail Check</guilabel>
and <guilabel>Switch offline on &kmail; Shutdown</guilabel>.
</para>
@@ -796,7 +796,7 @@ outgoing mail servers, and also set some options that affect all the messages yo
linkend="sending-mail">Setting up your Account: Sending</link>.</para>
<para>When you click <guibutton>Add...</guibutton> or
-<guibutton>Modify...</guibutton> the <guilabel>Create Outgoing
+<guibutton>Modify...</guibutton> the <guilabel>Create Outgoing
Account</guilabel> or <guilabel>Configure account</guilabel> dialogs
will open respectively. For sending via &Sendmail;
or similar programs
@@ -925,29 +925,29 @@ pane that tells you if a message is &HTML; or not. This is important because
&HTML; messages might imitate the look of a signed and encrypted message, so
you should be aware of the fact that you are reading an &HTML; message. The &HTML;
status bar itself cannot be influenced by the &HTML; code of the message.</para>
-
-<para>Enable <guilabel>Replace smileys by emoticons</guilabel> if you want smileys
-like <userinput>:-)</userinput> appearing in the message text to be
+
+<para>Enable <guilabel>Replace smileys by emoticons</guilabel> if you want smileys
+like <userinput>:-)</userinput> appearing in the message text to be
replaced by emoticons (small pictures) such as
<inlinemediaobject><imageobject>
<imagedata fileref="smile.png" format="PNG"/></imageobject>
</inlinemediaobject>.</para> --><!-- No longer on the General tab. -->
-<para>Enable <guilabel>Reduce font size for quoted text</guilabel> to show quoted
+<para>Enable <guilabel>Reduce font size for quoted text</guilabel> to show quoted
text (in a reply) with a smaller type face. <guilabel>Show expand/collapse quote marks</guilabel>
displays little widgets along with each bit of quoted text. These allow you to show (+)
or hide (-) nested quotes beyond a certain level. This is useful in protracted email
conversations where nobody deletes what has gone before.</para>
-<!-- <para><guilabel>Fallback character encoding</guilabel>:
-Some emails, especially those generated automatically, do not specify the
-character encoding which needs to be used to properly display them. In such
-cases a fallback character encoding will be used, which you can configure
-here. Set it to the character encoding most commonly used in your part of
+<!-- <para><guilabel>Fallback character encoding</guilabel>:
+Some emails, especially those generated automatically, do not specify the
+character encoding which needs to be used to properly display them. In such
+cases a fallback character encoding will be used, which you can configure
+here. Set it to the character encoding most commonly used in your part of
the world. As a default the encoding configured for the whole system is used.</para> -->
-<para>Changing <guilabel>Override character encoding:</guilabel>
-from its default value <guilabel>Auto</guilabel> will force the use of the specified
+<para>Changing <guilabel>Override character encoding:</guilabel>
+from its default value <guilabel>Auto</guilabel> will force the use of the specified
encoding for all messages, no matter what the &MIME; headers say. <guilabel>Minimum
font size:</guilabel> lets you control the smallest
font &kmail; will use. Set this higher if you have trouble reading really small fonts.</para>
@@ -1026,7 +1026,7 @@ when this option is in effect.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-<para>This section allows you to change the color of a few things by double clicking
+<para>This section allows you to change the color of a few things by double clicking
on an entry in the list box. Select <guilabel>Use custom colors</guilabel> to activate
this feature. Select <guilabel>Do not change color from original HTML mail</guilabel>
to preserve the color scheme selected by the sender of any &HTML; message.</para>
@@ -1058,7 +1058,7 @@ you may specify a percentage value as a threshold.</para>
</screenshot>
<para> </para><!-- add whitespace -->
<para>This tab lets you configure the layout of &kmail;'s main window.</para>
-<para>In the <guilabel>Folder List</guilabel> section you may choose between the
+<para>In the <guilabel>Folder List</guilabel> section you may choose between the
<guilabel>Long folder list</guilabel> (default option), which uses the full height of the window, and
the <guilabel>Short folder list</guilabel>. With the <guilabel>Short</guilabel> option, if you have selected
<guilabel>Show the message preview pane below the message list</guilabel>, the message
@@ -1110,8 +1110,8 @@ remove it entirely, and use only the full screen reader to view selected message
you will see a brief summary of each message (or group -- depends on the view mode) when
the mouse cursor hovers over a message list item.</para>
-<para><guilabel>Default Aggregation</guilabel> and
-<guilabel>Default Theme</guilabel> may be overridden using the <guilabel>Folder
+<para><guilabel>Default Aggregation</guilabel> and
+<guilabel>Default Theme</guilabel> may be overridden using the <guilabel>Folder
Properties</guilabel> dialog for each folder individually. Clicking the
<guibutton>Configure</guibutton> button opens a window to customize the pre-configured
aggregations / themes; you can create your own schemes that way.</para>
@@ -1124,28 +1124,28 @@ aggregations / themes; you can create your own schemes that way.</para>
<variablelist>
<varlistentry>
<term>Activity by Date, Flat</term>
-<listitem><para>This view uses day-by-day groups. Messages are not threaded. So for example,
+<listitem><para>This view uses day-by-day groups. Messages are not threaded. So for example,
in <quote>Today</quote> you will simply find all the messages that arrived today. The groups
are displayed by default in reverse chronological order, and labeled "Today", "Yesterday",
then the preceding five days of the week, followed by mm/dd/yy.</para></listitem>
</varlistentry>
<varlistentry>
<term>Activity by Date, Threaded</term>
-<listitem><para>This view uses day-by-day groups. Messages are threaded. So for example, in
+<listitem><para>This view uses day-by-day groups. Messages are threaded. So for example, in
<quote>Today</quote> you will find all the messages that arrived today and all the threads
that have been active today. Uses the same grouping as Activity by Date, Flat.</para></listitem>
</varlistentry>
<varlistentry>
<term>Current Activity, Flat</term>
-<listitem><para>This view uses smart date range groups. Messages are not threaded. So for
+<listitem><para>This view uses smart date range groups. Messages are not threaded. So for
example, in <quote>Today</quote> you will simply find all the messages that arrived today.
The groups are displayed by default in reverse chronological order: "Today", "Yesterday",
the five preceding days of the week, "Last Week", "Two Weeks Ago", and then month by month.</para></listitem>
</varlistentry>
<varlistentry>
<term>Current Activity, Threaded </term>
-<listitem><para>This view uses smart date range groups. Messages are threaded. So for
-example, in <quote>Today</quote> you will find all the messages that arrived today and all
+<listitem><para>This view uses smart date range groups. Messages are threaded. So for
+example, in <quote>Today</quote> you will find all the messages that arrived today and all
the threads that have been active today. Otherwise the same as Current Activity, Flat.</para></listitem>
</varlistentry>
<varlistentry>
@@ -1185,7 +1185,7 @@ date each thread began.</para></listitem>
</caption>
</mediaobject>
</screenshot> -->
-
+
<para>To create a custom aggregation theme, click the <guibutton>Configure...</guibutton> button. Select an existing aggregation similar to the one you want to
create, then click <guibutton>Clone Aggregation</guibutton>. If none are similar, click the <guibutton>New Aggregation</guibutton> button. The <guilabel>General</guilabel>
tab allows you to change the <guilabel>Name:</guilabel> and <guilabel>Description:</guilabel>. The <guilabel>Groups & Threading</guilabel> tab
@@ -1208,7 +1208,7 @@ You may also turn off threading altogether.
<guilabel>Thread expand policy:</guilabel> allows you to change how &kmail; determines whether a thread should be expanded.
</para></listitem>
</itemizedlist>
-<para>The <guilabel>Advanced</guilabel> tab lets you change the <guilabel>Fill view strategy:</guilabel> Choose
+<para>The <guilabel>Advanced</guilabel> tab lets you change the <guilabel>Fill view strategy:</guilabel> Choose
"Favor speed" if you have a slow connection. "Interactivity" will show
all of your current conversations first. "Batch" mode will not do any sorting.</para>
</listitem>
@@ -1252,7 +1252,7 @@ all of your current conversations first. "Batch" mode will not do any sorting.</
</caption>
</mediaobject>
</screenshot> -->
-
+
<para>To create a custom message list theme, click the <guibutton>Configure...</guibutton> button. Select an existing theme similar to the one you want to
create, then click <guibutton>Clone Theme</guibutton>. If none are similar, click the <guibutton>New Theme</guibutton> button. The <guilabel>
General</guilabel> tab allows you to change the <guilabel>Name:</guilabel> and <guilabel>Description:</guilabel>.</para>
@@ -1269,7 +1269,7 @@ You can change the font and color of column items through the view area &RMB; me
resize columns via the &RMB; menu on the column bar.</para>
<para>The <guilabel>Advanced</guilabel> tab lets you show headers. You may also change the size of status icons.</para>
-</listitem></varlistentry>
+</listitem></varlistentry>
</variablelist>
</listitem></varlistentry>
</variablelist>
@@ -1286,7 +1286,7 @@ on <guilabel>Custom format information</guilabel> and follow the directions.</pa
<sect2 id="configure-message-tags">
<title>Message Tags</title>
-
+
<screenshot>
<screeninfo>Appearance Tags</screeninfo>
<mediaobject>
@@ -1324,31 +1324,31 @@ dialog. You may choose any or all of six options.</para>
be presented when you choose this option. Select a preset
color, or choose "Custom..." for more flexibility.</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Change background color:</guilabel></term>
<listitem><para>Choose this option to alter the background color
of tagged message list entries.</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Change font:</guilabel></term>
<listitem><para>You may select either a bold or
<emphasis>italic</emphasis> type face.</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Message tag icon:</guilabel></term>
<listitem><para>Click this button to open an icon selection
dialog. The icon will be displayed on tagged message list entries.</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Shortcut:</guilabel></term>
<listitem><para>Use this button to create a keyboard shortcut
for associating this tag with selected messages.</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Enable toolbar button:</guilabel></term>
<listitem><para>Select this option to add a new button to the &kmail;
@@ -1359,14 +1359,14 @@ dialog. You may choose any or all of six options.</para>
<para>All the tags defined here will automatically appear as new options in the <menuchoice>
<guimenu>Message</guimenu><guisubmenu>Mark Message ></guisubmenu></menuchoice> sub-menu.</para>
</sect2>
-
+
</sect1>
<sect1 id="configure-composer">
<title>
Composer Page
</title>
-
+
<para>
For a description of how to use the <guilabel>Composer</guilabel>,
read <link linkend="the-composer-window">this page</link>. To
@@ -1378,7 +1378,7 @@ dialog. You may choose any or all of six options.</para>
<title>
General
</title>
-
+
<screenshot>
<screeninfo>Composer General</screeninfo>
<mediaobject>
@@ -1394,13 +1394,13 @@ dialog. You may choose any or all of six options.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<para>
This dialog lets you adjust the way &kmail; handles signatures.
It also permits you to control some formatting features, to adjust
some autocompletion options, and to tweak &kmail;'s autosave feature.
</para>
-
+
<variablelist>
<varlistentry id="configure-composer-general-append-signature">
<term>
@@ -1648,26 +1648,26 @@ dialog. You may choose any or all of six options.</para>
<para> </para><!-- add whitespace -->
<para>
- Here you can add, edit, and delete custom message templates to use
- when you compose a reply or forward a message. Create the custom template
+ Here you can add, edit, and delete custom message templates to use
+ when you compose a reply or forward a message. Create the custom template
by typing the name into the input box and press the <guiicon>+</guiicon> button.
You can bind a keyboard combination to the template for faster operations.
</para>
<!-- To and CC field--><!-- I tested this, and I can't get it to work. David Bryant -->
-
+
<para>
- Message templates support substitution commands, by simply typing them
+ Message templates support substitution commands, by simply typing them
or selecting them from the <guimenu>Insert Command</guimenu> menu.
</para>
-
+
<para>
- There are four types of custom templates: used to <guilabel>Reply</guilabel>,
- <guilabel>Reply to All</guilabel>, <guilabel>Forward</guilabel>, and
- <guilabel>Universal</guilabel> which can be used for all kinds of operations.
+ There are four types of custom templates: used to <guilabel>Reply</guilabel>,
+ <guilabel>Reply to All</guilabel>, <guilabel>Forward</guilabel>, and
+ <guilabel>Universal</guilabel> which can be used for all kinds of operations.
You cannot bind a keyboard shortcut to <guilabel>Universal</guilabel>
templates.
</para>
-
+
<para> </para><!-- add whitespace -->
</sect2>
@@ -1817,7 +1817,7 @@ dialog. You may choose any or all of six options.</para>
words which may indicate that you want to include an attachment. The list
of key words can be modified.
</para>
-
+
<para>
Use the <guilabel>Maximum Attachment Size:</guilabel> spin box to
limit the size of any attachments you send. If you try to attach a
@@ -1826,7 +1826,7 @@ dialog. You may choose any or all of six options.</para>
limit, and not an aggregate limit. Also, the file size is checked
before the file is converted to base 64 encoding, if that is necessary.
</para>
-
+
<para> </para><!-- add whitespace -->
</sect2>
@@ -1847,17 +1847,17 @@ dialog. You may choose any or all of six options.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<para>
To enable automatic correction of common typing errors, select the <guilabel>Enable
autocorrection</guilabel> option. Use the drop down list to choose your language.
You may import settings, either from <application>LibreOffice</application> or another &kmail;
/ &calligra; installation, via the <guibutton>Import ... <inlinemediaobject>
<imageobject><imagedata fileref="go-down.png" format="PNG"/></imageobject>
- </inlinemediaobject></guibutton> button. If you need to save your settings for
+ </inlinemediaobject></guibutton> button. If you need to save your settings for
another installation or application, use the <guibutton>Export...</guibutton> button.
</para>
-
+
<para>
<variablelist><title>Autocorrect Options</title>
<varlistentry>
@@ -1904,11 +1904,11 @@ dialog. You may choose any or all of six options.</para>
</varlistentry>
</variablelist>
</para>
-
+
<para>
Once you have made all of your autocorrect selections, click <guibutton>Apply</guibutton>, or <guibutton>OK</guibutton>.
</para>
- <para> </para><!-- add whitespace -->
+ <para> </para><!-- add whitespace -->
</sect2>
<sect2 id="configure-resize-image">
@@ -1928,19 +1928,19 @@ dialog. You may choose any or all of six options.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<para>
In some circumstances you may want to have &kmail; automatically resize image attachments in
outgoing emails (⪚, because of server limits). To do so, select <guilabel>Automatically resize
images</guilabel>. There are several options that accompany this feature.
</para>
-
+
<variablelist>
<varlistentry><term><guilabel>General</guilabel></term>
<listitem>
<para>
There are three options under "General". If you want to preserve the aspect ratio
- of all images, select <guilabel>Keep ratio</guilabel>. &kmail; by default asks you
+ of all images, select <guilabel>Keep ratio</guilabel>. &kmail; by default asks you
if you want to resize before resizing. If you want the program to resize images
without asking, unselect <guilabel>Ask before resizing</guilabel>. &kmail; will by default
send the resized image in <acronym>JPG</acronym> format. If you would rather have such images sent in
@@ -1962,10 +1962,10 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry><term><guilabel>Filename</guilabel></term>
<listitem>
-
+
<variablelist>
<varlistentry><term><guilabel>Source filter</guilabel></term>
<listitem>
@@ -2010,10 +2010,10 @@ dialog. You may choose any or all of six options.</para>
</listitem>
</varlistentry>
</variablelist>
-
+
</listitem>
</varlistentry>
-
+
<varlistentry><term><guilabel>Recipients</guilabel></term>
<listitem>
<para>
@@ -2033,7 +2033,7 @@ dialog. You may choose any or all of six options.</para>
<sect1 id="configure-security">
<title>Security Page</title>
-
+
<para>
The Security configuration dialog lets you fine-tune certain rich text (&HTML;) options.
It also allows you to control encryption and decryption features, to adjust some built-in
@@ -2042,10 +2042,10 @@ dialog. You may choose any or all of six options.</para>
anything to do with anti-virus security measures. See the <link linkend="the-anti-virus-wizard">Using
&kmail;: The Anti-Virus Wizard</link> chapter if you want anti-virus security.
</para>
-
+
<sect2 id="configure-security-reading">
<title>Reading</title>
-
+
<screenshot>
<screeninfo>Security Reading</screeninfo>
<mediaobject>
@@ -2060,8 +2060,8 @@ dialog. You may choose any or all of six options.</para>
</caption>
</mediaobject>
</screenshot>
- <para> </para><!-- add whitespace -->
-
+ <para> </para><!-- add whitespace -->
+
<para>On this tab you can configure security options that
affect the way you read messages.</para>
@@ -2097,7 +2097,7 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<!--http://www.aegiap.eu/kdeblog/2013/04/news-in-kdepim-4-11-scam-detection/-->
<varlistentry id="configure-security-email-scams">
<term><guilabel>Informs if message reading is a suspected email scam</guilabel></term>
@@ -2119,7 +2119,7 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Check URL with Phishing Google System</guilabel></term>
<listitem>
@@ -2129,7 +2129,7 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Scan emails for tracking URLs</guilabel></term>
<listitem>
@@ -2139,7 +2139,7 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Attempt decryption of encrypted messages when viewing</guilabel></term>
<listitem>
@@ -2149,7 +2149,7 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Automatically import keys and certificate</guilabel></term>
<listitem>
@@ -2172,7 +2172,7 @@ dialog. You may choose any or all of six options.</para>
</variablelist>
<para> </para><!-- add whitespace -->
</sect2>
-
+
<sect2 id="configure-message-disposition-notifications">
<title>Message Disposition Notifications</title>
<screenshot>
@@ -2190,7 +2190,7 @@ dialog. You may choose any or all of six options.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<variablelist>
<varlistentry id="configure-security-reading-mdns">
<term>
@@ -2225,7 +2225,7 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>
<guilabel>Ask</guilabel>
@@ -2239,7 +2239,7 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>
<guilabel>Deny</guilabel>
@@ -2255,7 +2255,7 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>
<guilabel>Always send</guilabel>
@@ -2275,21 +2275,21 @@ dialog. You may choose any or all of six options.</para>
</listitem>
</varlistentry>
</variablelist>
-
+
<para>
If you are unsure, experiment a while with
<guilabel>Ask</guilabel>. Then, if you find &kmail;'s
questions annoying, switch to <guilabel>Ignore</guilabel>.
</para>
<para> </para><!-- add whitespace -->
-
+
<para>
The following options (listed as <guilabel>Quote
original message</guilabel>) are available to control
<emphasis>how much</emphasis> of the original message
&kmail; sends back with &mdn;s.
</para>
-
+
<variablelist>
<varlistentry>
<term>
@@ -2305,7 +2305,7 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>
<guilabel>Full message</guilabel>
@@ -2322,7 +2322,7 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>
<guilabel>Only headers</guilabel>
@@ -2338,7 +2338,7 @@ dialog. You may choose any or all of six options.</para>
</listitem>
</varlistentry>
</variablelist>
-
+
<para>
If unsure, leave this option set to the default value (nothing).
</para>
@@ -2392,7 +2392,7 @@ dialog. You may choose any or all of six options.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<para>
On this tab you can configure security-relevant options for
composing messages.
@@ -2551,7 +2551,7 @@ dialog. You may choose any or all of six options.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<para>
On this tab you can switch security-relevant warnings on and
@@ -2638,14 +2638,14 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>
<guibutton>GnuPG Settings ...</guibutton>
</term>
<listitem>
<para>
- Click on this button to open an extensive dialog which configures the
+ Click on this button to open an extensive dialog which configures the
interactions between &kmail; and &gpg;, the Gnu Privacy Guard
program. &gpg; is too complex to document here. For details you
should refer to <ulink url="https://www.gnupg.org/docs.html#guides">The
@@ -2654,7 +2654,7 @@ dialog. You may choose any or all of six options.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry id="configure-security-warnings-reenable-all-warnings">
<term>
<guilabel>Re-Enable All "Don't Ask Again" Warnings</guilabel>
@@ -2979,7 +2979,7 @@ dialog. You may choose any or all of six options.</para>
go to the next or previous unread message (⪚ <keycap>Space</keycap>).
If you ask &kmail; to go to the next unread message although there is no
unread message below the currently selected message then the following happens.
-
+
<itemizedlist>
<listitem>
<para>
@@ -3010,7 +3010,7 @@ dialog. You may choose any or all of six options.</para>
<listitem>
<para>
This option controls what happens when you open a folder.
-
+
<itemizedlist>
<listitem>
<para>
@@ -3096,7 +3096,7 @@ that is used when you create a new folder.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Allow deleting messages without confirmation</guilabel></term>
<listitem>
@@ -3131,7 +3131,7 @@ that is used when you create a new folder.</para>
</caption>
</mediaobject>
</screenshot>
- <para> </para><!-- add whitespace -->
+ <para> </para><!-- add whitespace -->
<variablelist>
@@ -3143,7 +3143,7 @@ that is used when you create a new folder.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Send invitations in the mail body</guilabel></term>
<listitem>
@@ -3154,7 +3154,7 @@ that is used when you create a new folder.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Exchange compatible invitations naming</guilabel></term>
<listitem>
@@ -3166,7 +3166,7 @@ that is used when you create a new folder.</para>
</para>
</listitem>
</varlistentry>
-
+
<!--varlistentry>
<term><guilabel>Outlook compatible invitation reply comments</guilabel></term>
<listitem>
@@ -3187,18 +3187,18 @@ This is the default. The user can turn this option off if they want to see the i
<term><guilabel>Automatic invitation sending</guilabel></term>
<listitem>
<para>When this is checked, you will not see the mail composer window. Instead,
-all invitation mails are sent automatically. If you want to see the mail
-before sending it, you can uncheck this option. However, be aware that the
-text in the composer window is in iCalendar syntax, and you should not try
+all invitation mails are sent automatically. If you want to see the mail
+before sending it, you can uncheck this option. However, be aware that the
+text in the composer window is in iCalendar syntax, and you should not try
modifying it by hand.</para>
</listitem>
</varlistentry--><!-- These options are no longer available. @dcb2020342-->
-
+
<varlistentry>
<term><guilabel>Delete invitation emails after the reply to them has been sent</guilabel></term>
<listitem>
<para>
- When this option is checked, invitations that have been replied to
+ When this option is checked, invitations that have been replied to
will be moved to the Trash folder as soon as the reply has been sent.
</para>
</listitem>
@@ -3224,13 +3224,13 @@ modifying it by hand.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<para>
This dialog helps you fine tune the way the <menuchoice>
<guimenu>File</guimenu><guimenuitem>Print</guimenuitem>
</menuchoice> function operates.
- </para>
-
+ </para>
+
<variablelist>
<varlistentry>
@@ -3242,7 +3242,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Respect expand/collapse quote marks settings</guilabel></term>
<listitem>
@@ -3253,7 +3253,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Print background color and images</guilabel></term>
<listitem>
@@ -3263,7 +3263,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Always show encryption/signature details</guilabel></term>
<listitem>
@@ -3273,7 +3273,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
</variablelist>
</sect2>
@@ -3281,54 +3281,54 @@ modifying it by hand.</para>
<sect1 id="configure-plugins">
<title>Plugins Page</title>
-
+
<para>
- &kmail; contains a large number of special functions that may or may not
+ &kmail; contains a large number of special functions that may or may not
be useful for particular users. You may select one or more of these special
functions by choosing it / them on the "plugins" configuration page. Or, if
you don't want or need a particular function, you can conserve time and storage
space by deselecting the associated plugin module.
</para>
-
+
<para>
On many Linux distributions, most of these plugins are not included in the basic
&kmail; package. To get full plugin functionality, be sure to install the
package named "kdepim-addons" (or something similar).
</para>
-
+
<para>
You can get a rough idea of what a particular plugin does by simply highlighting
the name of the plugin on the &kmail; configuration page. A brief description
of that plugin's function will then appear on the right hand side of the dialog.
</para>
-
+
<para>
The various plugins currently available in &kmail; (2021) are listed below.
Note that the set of "default" plugins is based on the openSUSE version
of &kmail; (5.14.2) used as a reference for this edition of the documentation.
The actual defaults on your system may be different; they're distro dependent.
</para>
-
- <para>
- Because new functionality is added from time to time, this list may grow
+
+ <para>
+ Because new functionality is added from time to time, this list may grow
longer as time passes. There are two general rules governing plugin
structure you can count on even if the particular plugin you are
confronting is not listed below.
</para>
-
+
<para>
1. If the plugin has configurable variables, you can open the configuration
dialog for that plugin by clicking the <guibutton> <inlinemediaobject>
<imageobject><imagedata fileref="configurebutton.png" format="PNG"/></imageobject>
</inlinemediaobject> </guibutton> button appearing next to the plugin's name.
</para>
-
+
<para>
2. Whenever a plugin is selected or deselected, &kmail; must be restarted before
the desired change(s) can take effect.
</para>
<para> </para><!-- add whitespace -->
-
+
<sect2 id="configure-plugins-akonadi">
<title>Akonadi and Check Before Send</title>
<screenshot>
@@ -3346,33 +3346,33 @@ modifying it by hand.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<variablelist>
-
+
<varlistentry>
<term><guilabel>Archive Mail Agent</guilabel></term>
<listitem>
<para>
- Select this option to enable automatic archiving. See the <ulink
+ Select this option to enable automatic archiving. See the <ulink
url="help:/akonadi_archivemail_agent">Archive Mail Agent</ulink>
documentation for detailed information. You may also wish to read
- the <link linkend="archiving">Archiving</link> section of this
+ the <link linkend="archiving">Archiving</link> section of this
handbook. This plugin is enabled by default.
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Followup Reminder Agent</guilabel></term>
<listitem>
<para>
- Select this option to enable followup reminders. See the <ulink
+ Select this option to enable followup reminders. See the <ulink
url="help:/akonadi_followupreminder_agent">Followup Reminder Agent</ulink>
documentation for additional information. This plugin is enabled by default.
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>New Email Notifier</guilabel></term>
<listitem>
@@ -3384,18 +3384,18 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Send Later Agent</guilabel></term>
<listitem>
<para>
- Select this option to enable delayed dispatching. See the <ulink
+ Select this option to enable delayed dispatching. See the <ulink
url="help:/akonadi_sendlater_agent">Send Later Agent</ulink>
documentation for additional information. This plugin is enabled by default.
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Unified Mailbox Agent</guilabel></term>
<listitem>
@@ -3404,13 +3404,13 @@ modifying it by hand.</para>
will automatically create three of these, labeled Inbox, Drafts, and
Sent. If you have defined both a Local Folders inbox and one or more
&IMAP; inbox destinations, &kmail; will display all the various inbox
- files as one consolidated virtual Inbox folder. You may use the
+ files as one consolidated virtual Inbox folder. You may use the
configuration dialog to create additional virtual mailboxes, tailoring
each one as you see fit. This plugin is disabled by default.
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Automatic Add Contacts</guilabel></term>
<listitem>
@@ -3422,7 +3422,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Check Before Send</guilabel></term>
<listitem>
@@ -3434,7 +3434,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Confirm Address</guilabel></term>
<listitem>
@@ -3445,11 +3445,11 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
</variablelist>
<para> </para><!-- add whitespace -->
</sect2>
-
+
<sect2 id="configure-plugins-composer">
<title>Composer / Editor</title>
<screenshot>
@@ -3467,9 +3467,9 @@ modifying it by hand.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<variablelist>
-
+
<varlistentry>
<term><guilabel>Open External Composer</guilabel></term>
<listitem>
@@ -3480,7 +3480,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Autocorrection</guilabel></term>
<listitem>
@@ -3492,7 +3492,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Change Case</guilabel></term>
<listitem>
@@ -3503,7 +3503,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Insert Email</guilabel></term>
<listitem>
@@ -3516,7 +3516,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Insert Non Breaking Space</guilabel></term>
<listitem>
@@ -3527,7 +3527,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Insert Short URL</guilabel></term>
<listitem>
@@ -3537,7 +3537,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Insert Special Character</guilabel></term>
<listitem>
@@ -3548,7 +3548,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Quick Text</guilabel></term>
<listitem>
@@ -3559,7 +3559,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Share Text</guilabel></term>
<listitem>
@@ -3571,7 +3571,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Zoom Text</guilabel></term>
<listitem>
@@ -3582,11 +3582,11 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
- </variablelist>
+
+ </variablelist>
<para> </para><!-- add whitespace -->
</sect2>
-
+
<sect2 id="configure-plugins-grammar">
<title>Grammar Check / Header Styles</title>
<screenshot>
@@ -3604,9 +3604,9 @@ modifying it by hand.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<variablelist>
-
+
<varlistentry>
<term><guilabel>French Grammar Checker</guilabel></term>
<listitem>
@@ -3618,7 +3618,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Grammar Checker (Language Tool)</guilabel></term>
<listitem>
@@ -3631,17 +3631,17 @@ modifying it by hand.</para>
</listitem>
</varlistentry>
</variablelist>
- <para> </para><!-- add whitespace -->
-
+ <para> </para><!-- add whitespace -->
+
<para>
The following six plugins permit you to decide which header styles can
be selected from the <guimenu>View</guimenu> menu. See <link
linkend="the-preview-pane-headers">the description of various header
views</link> in the "Using &kmail;" chapter for more information.
</para>
-
+
<variablelist>
-
+
<varlistentry>
<term><guilabel>Brief Header Style</guilabel></term>
<listitem>
@@ -3651,7 +3651,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Default Grantlee Header Style</guilabel></term>
<listitem>
@@ -3661,7 +3661,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Fancy Header Style</guilabel></term>
<listitem>
@@ -3671,7 +3671,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Grantlee Header Style</guilabel></term>
<listitem>
@@ -3681,7 +3681,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Long Header Style</guilabel></term>
<listitem>
@@ -3693,22 +3693,22 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Standards Header Style</guilabel></term>
<listitem>
<para>
Select this option to enable the display of "Standard" headers.
- This plugin is disabled by default. (Standard headers are the
+ This plugin is disabled by default. (Standard headers are the
same as Fancy headers, but without the shaded background.)
</para>
</listitem>
</varlistentry>
-
- </variablelist>
+
+ </variablelist>
<para> </para><!-- add whitespace -->
</sect2>
-
+
<sect2 id="configure-plugins-misc">
<title>Message Viewer / Miscellaneous</title>
<screenshot>
@@ -3726,7 +3726,7 @@ modifying it by hand.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<para>
The next six plugins all provide special functions that can only be invoked
with a toolbar button. Use the <menuchoice><guimenu>Settings</guimenu>
@@ -3735,9 +3735,9 @@ modifying it by hand.</para>
</menuchoice> dialog to add or remove the toolbar buttons associated with these
functions after you select or disable one of these plugins.
</para>
-
+
<variablelist>
-
+
<varlistentry>
<term><guilabel>Create Event</guilabel></term>
<listitem>
@@ -3747,7 +3747,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Create Note</guilabel></term>
<listitem>
@@ -3757,7 +3757,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Create Todo</guilabel></term>
<listitem>
@@ -3767,7 +3767,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Expand URL</guilabel></term>
<listitem>
@@ -3777,7 +3777,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>External Script</guilabel></term>
<listitem>
@@ -3790,7 +3790,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Translator</guilabel></term>
<listitem>
@@ -3802,22 +3802,22 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
- </variablelist>
+
+ </variablelist>
<para> </para><!-- add whitespace -->
-
+
<para>
The next four items are not really plugins; they are built-in
- &kmail; functions. Each one of these can be configured separately,
+ &kmail; functions. Each one of these can be configured separately,
by using the <guibutton> <inlinemediaobject><imageobject>
<imagedata fileref="configurebutton.png" format="PNG"/></imageobject>
</inlinemediaobject> </guibutton> button appearing next to the
function's name. No restart is needed to make these configuration
variables take effect.
</para>
-
+
<variablelist>
-
+
<varlistentry>
<term><guilabel>DKIM Checker</guilabel></term>
<listitem>
@@ -3839,7 +3839,7 @@ modifying it by hand.</para>
<para> </para><!-- add whitespace -->
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Expire Trash Folder</guilabel></term>
<listitem>
@@ -3850,7 +3850,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Folder Settings</guilabel></term>
<listitem>
@@ -3858,12 +3858,12 @@ modifying it by hand.</para>
Use this configuration dialog to set custom folder properties for several
different folders at once. You can select the folders to be modified
from a tree view of all your folders on the left, and select properties
- to be set from the General, View, Templates, and Expiry tabs of the
+ to be set from the General, View, Templates, and Expiry tabs of the
<link linkend="folders-properties-window">"Folder Properties"</link> dialog.
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Gravatar</guilabel></term>
<listitem>
@@ -3873,11 +3873,11 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
</variablelist>
<para> </para><!-- add whitespace -->
</sect2>
-
+
<sect2 id="configure-plugins-tools">
<title>Tools</title>
@@ -3896,9 +3896,9 @@ modifying it by hand.</para>
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<variablelist>
-
+
<varlistentry>
<term><guilabel>Antispam</guilabel></term>
<listitem>
@@ -3911,7 +3911,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Antivirus</guilabel></term>
<listitem>
@@ -3924,7 +3924,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Expert Plugin</guilabel></term>
<listitem>
@@ -3935,7 +3935,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Log Activities</guilabel></term>
<listitem>
@@ -3948,7 +3948,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Adblock</guilabel></term>
<listitem>
@@ -3960,7 +3960,7 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term><guilabel>Do Not Track</guilabel></term>
<listitem>
@@ -3984,10 +3984,10 @@ modifying it by hand.</para>
</para>
</listitem>
</varlistentry>
-
+
</variablelist>
</sect2>
-
+
</sect1>
<sect1 id="configure-non-gui-options">
diff --git a/doc/kmail2/credits-and-licenses.docbook b/doc/kmail2/credits-and-licenses.docbook
index f17c430a02..f7d5de1bd9 100644
--- a/doc/kmail2/credits-and-licenses.docbook
+++ b/doc/kmail2/credits-and-licenses.docbook
@@ -185,7 +185,7 @@
&David.Bryant; &David.Bryant.mail;.</para>
<para>Update for &kmail; 4.11 by
-&Laurent.Montel; &Laurent.Montel.mail; and
+&Laurent.Montel; &Laurent.Montel.mail; and
&Scarlett.Clark; &Scarlett.Clark.mail;.</para>
<para>Update for &kmail; 1.7 by
@@ -211,7 +211,7 @@ Original documentation by &Bernd.Johannes.Wuebben;
<email>rwilliams at kde.org</email> (Editor).</para>
<para>Thanks to Michael Elkins <email>me at cs.hmc.edu</email> for his excellent
-description of the different &UNIX; mail formats in the <application>Mutt</application>
+description of the different &UNIX; mail formats in the <application>Mutt</application>
documentation.</para>
<para>Thanks to the following people for providing directions on using other
@@ -220,7 +220,7 @@ email client mailboxes with &kmail;:</para>
<itemizedlist>
<listitem><para>Nik Gaffney <email>nik at f0.am</email>
(<application>Mailsmith</application>)</para></listitem>
-<listitem><para>David McMillen <email>mcmillen at math.bu.edu</email> and
+<listitem><para>David McMillen <email>mcmillen at math.bu.edu</email> and
Mendel Mobach <email>mendel at mobach.nl</email> (&Netscape; mail)</para></listitem>
<listitem><para>Ed Shapard <email>shapard at bigfoot.com</email>
(<application>Pegasus</application> Mail)</para></listitem>
diff --git a/doc/kmail2/faq.docbook b/doc/kmail2/faq.docbook
index 33900544e9..cfb7b3e5a6 100644
--- a/doc/kmail2/faq.docbook
+++ b/doc/kmail2/faq.docbook
@@ -20,24 +20,24 @@
<qandaentry>
<question><para>How can I set Firefox as my default browser?</para></question>
<answer>
- <para><emphasis>Problem:</emphasis> You want to click on a link in &kmail; and have the link opened in
+ <para><emphasis>Problem:</emphasis> You want to click on a link in &kmail; and have the link opened in
<application>Firefox</application>. At the moment, another browser is used. You want to change this.</para>
- <para><emphasis>Solution:</emphasis> This change will affect all of &kde;, not just &kmail;. Select <menuchoice>
- <guimenu>&systemsettings;</guimenu><guisubmenu>Default Applications</guisubmenu><guimenuitem>Web
+ <para><emphasis>Solution:</emphasis> This change will affect all of &kde;, not just &kmail;. Select <menuchoice>
+ <guimenu>&systemsettings;</guimenu><guisubmenu>Default Applications</guisubmenu><guimenuitem>Web
Browser</guimenuitem><guimenuitem>Mozilla Firefox</guimenuitem></menuchoice>.</para>
-
+
<para>If you are an administrator and want to make this setting automatically for your users, do this.</para>
<itemizedlist>
<listitem>
<para>Run <screen># qtpaths --paths ConfigLocation</screen> in a terminal. This will display the path(s) leading to
configuration files for KDE programs in your system. Use the path starting in each user's Home directory, and
- locate the file named <filename>kdeglobals</filename>, then add this line under category
+ locate the file named <filename>kdeglobals</filename>, then add this line under category
<guilabel>[General]</guilabel>:</para>
<para><userinput>BrowserApplication[$e]=firefox.desktop</userinput>
</para>
</listitem>
</itemizedlist>
- <para>You can also try the script in
+ <para>You can also try the script in
<ulink url="https://userbase.kde.org/Special:myLanguage/Tutorials/Modify_KDE_Software_Defaults">Tutorials/
Modify_KDE_Software_Defaults</ulink></para>
<note><para>The actual physical location of configuration variables is distribution dependent. Do not
@@ -51,13 +51,13 @@
<question><para>How do I control my Roaming profile's connection?</para></question>
<answer>
<para><emphasis>Problem:</emphasis> You set up a <emphasis>Roaming profile</emphasis> so you can access your
- home server while you are on the road, but it keeps trying to connect even when you are at home.
+ home server while you are on the road, but it keeps trying to connect even when you are at home.
Auto-connection is disabled in the setup screens.</para>
- <para><emphasis>Solution:</emphasis> Navigate to <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
+ <para><emphasis>Solution:</emphasis> Navigate to <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
KMail</guisubmenu><guimenuitem>Accounts</guimenuitem><guimenuitem>Receiving (tab)</guimenuitem>
- <guimenuitem>(select the account to exclude)</guimenuitem><guimenuitem>Retrieval Options</guimenuitem>
- </menuchoice>, then uncheck <guilabel>Include in Manual Mail Check</guilabel>. This will exclude that profile
- when you hit the download icon, but the account will still be available from the drop-down list, making it easy
+ <guimenuitem>(select the account to exclude)</guimenuitem><guimenuitem>Retrieval Options</guimenuitem>
+ </menuchoice>, then uncheck <guilabel>Include in Manual Mail Check</guilabel>. This will exclude that profile
+ when you hit the download icon, but the account will still be available from the drop-down list, making it easy
to retrieve your mail when away from home.</para><para> </para>
</answer>
</qandaentry>
@@ -67,13 +67,13 @@
<answer>
<para><emphasis>Problem:</emphasis> You want to store the messages you have sent in a special folder. Maybe you
are using an &IMAP; server and wish to store your sent mail on the server, not in a local folder.</para>
- <para><emphasis>Solution:</emphasis> In &kmail;, navigate to
- <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
- KMail</guisubmenu><guimenuitem>Identities</guimenuitem><guimenuitem>(Choose an
- identity)</guimenuitem><guimenuitem>Modify</guimenuitem><guimenuitem>Advanced</guimenuitem><guimenuitem>Sent-mail
+ <para><emphasis>Solution:</emphasis> In &kmail;, navigate to
+ <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
+ KMail</guisubmenu><guimenuitem>Identities</guimenuitem><guimenuitem>(Choose an
+ identity)</guimenuitem><guimenuitem>Modify</guimenuitem><guimenuitem>Advanced</guimenuitem><guimenuitem>Sent-mail
folder</guimenuitem></menuchoice> and select the folder you want to use.</para>
<para>Alternatively, you can use the <guilabel>Sent-Mail Folder</guilabel> field (accessible via the
- <guimenu>View</guimenu> menu in the composer window) to override the default sent mail folder for a particular
+ <guimenu>View</guimenu> menu in the composer window) to override the default sent mail folder for a particular
message.</para><para> </para>
</answer>
</qandaentry>
@@ -81,9 +81,9 @@
<qandaentry>
<question><para>How do I move trash email messages to a special folder?</para></question>
<answer>
- <para><emphasis>Problem:</emphasis> You want to store trash in a special folder. Maybe you are using an &IMAP;
+ <para><emphasis>Problem:</emphasis> You want to store trash in a special folder. Maybe you are using an &IMAP;
server and want trashed email messages to be stored on the server, not locally.</para>
- <para><emphasis>Solution:</emphasis> In the settings dialog select an &IMAP; account on the
+ <para><emphasis>Solution:</emphasis> In the settings dialog select an &IMAP; account on the
<guilabel>Accounts</guilabel> page. Click on <guibutton>Modify</guibutton> and change the
trash folder location via the <guilabel>Advanced</guilabel> tab.</para><para> </para>
</answer>
@@ -93,9 +93,9 @@
<qandaentry>
<question><para>How can I store encrypted messages in unencrypted form?</para></question>
<answer>
- <para><emphasis>Problem:</emphasis> You exchange encrypted mail with a friend, but would like to store your
+ <para><emphasis>Problem:</emphasis> You exchange encrypted mail with a friend, but would like to store your
own copy unencrypted, once you have opened the message.</para>
- <para><emphasis>Solution:</emphasis> To store emails that have been decrypted once in unencrypted format
+ <para><emphasis>Solution:</emphasis> To store emails that have been decrypted once in unencrypted format
thereafter, add this item to your <filename>kmail2rc</filename> configuration file, in the [Reader] section:</para>
<para><userinput>store-displayed-messages-unencrypted=true</userinput>.</para><para> </para>
</answer>
@@ -105,15 +105,15 @@
<question><para>How do I filter spam on an &IMAP; server?</para></question>
<!--FIXME replace this with a link to the sieve section?-->
<answer>
- <para><emphasis>Problem:</emphasis> You intend to read your mail from an &IMAP; server, and wonder how
+ <para><emphasis>Problem:</emphasis> You intend to read your mail from an &IMAP; server, and wonder how
filtering and spam handling will occur.</para>
- <para><emphasis>Solution:</emphasis> The machine that already has your mail can become your &IMAP; server. You will
- have to configure a server application. <application>Dovecot</application> is one such, and the guidance on the
- project web pages make it relatively simple to set up. That still leaves you with the problem of filtering, as
- it makes sense to do that on the server (when you point &kmail; at the server you will see the folders that have
+ <para><emphasis>Solution:</emphasis> The machine that already has your mail can become your &IMAP; server. You will
+ have to configure a server application. <application>Dovecot</application> is one such, and the guidance on the
+ project web pages make it relatively simple to set up. That still leaves you with the problem of filtering, as
+ it makes sense to do that on the server (when you point &kmail; at the server you will see the folders that have
been created on that system). There are several options. One of the best known is
- <application>Procmail</application>. Another one is <application>Imapfilter</application>. There is plenty of
- information on the internet about setting these up. Further discussion of these OSS packages is beyond the scope
+ <application>Procmail</application>. Another one is <application>Imapfilter</application>. There is plenty of
+ information on the internet about setting these up. Further discussion of these OSS packages is beyond the scope
of &kmail;'s documentation.</para>
<para> </para>
</answer>
@@ -122,18 +122,18 @@
<qandaentry>
<question><para>How can I get more screen space in &kmail;?</para></question>
<answer>
- <para><emphasis>Problem:</emphasis> You are using &kmail; on a laptop or notebook, and find that the new
+ <para><emphasis>Problem:</emphasis> You are using &kmail; on a laptop or notebook, and find that the new
<emphasis>Aggregation</emphasis> display leaves you too little screen space.</para>
- <para><emphasis>Solution:</emphasis>If you want to change the message list so each message uses a single line
- instead of two lines, go to <menuchoice><guimenu>View</guimenu><guisubmenu>Message List</guisubmenu>
- <guimenuitem>Theme</guimenuitem></menuchoice> and change the theme to <guilabel>Classic</guilabel>. If
- you want to disable grouping by date, change the aggregation using <menuchoice><guimenu>View</guimenu>
- <guisubmenu>Message List</guisubmenu><guimenuitem>Aggregation</guimenuitem></menuchoice> to <guilabel>Standard
+ <para><emphasis>Solution:</emphasis>If you want to change the message list so each message uses a single line
+ instead of two lines, go to <menuchoice><guimenu>View</guimenu><guisubmenu>Message List</guisubmenu>
+ <guimenuitem>Theme</guimenuitem></menuchoice> and change the theme to <guilabel>Classic</guilabel>. If
+ you want to disable grouping by date, change the aggregation using <menuchoice><guimenu>View</guimenu>
+ <guisubmenu>Message List</guisubmenu><guimenuitem>Aggregation</guimenuitem></menuchoice> to <guilabel>Standard
Mailing List</guilabel>. Now your &kmail; will look exactly like it did in early versions of the program.</para>
- <para>In <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure &kmail;</guisubmenu>
- <guimenuitem>Appearance</guimenuitem><guimenuitem>Fonts</guimenuitem></menuchoice> you can select
+ <para>In <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure &kmail;</guisubmenu>
+ <guimenuitem>Appearance</guimenuitem><guimenuitem>Fonts</guimenuitem></menuchoice> you can select
<guilabel>Use custom fonts</guilabel> to change the setting for the message list. You can also set
the font size in the <guilabel>Use custom fonts</guilabel> dialog.</para>
<para> </para>
@@ -143,7 +143,7 @@
<qandaentry>
<question><para>How can I turn &kmail; folder tool tips off?</para></question>
<answer>
- <para><emphasis>Problem:</emphasis> You are using &kmail; on a laptop or notebook, and find that the
+ <para><emphasis>Problem:</emphasis> You are using &kmail; on a laptop or notebook, and find that the
<emphasis>tooltips</emphasis> that pop up hide too many folder names</para>
<para><emphasis>Solution:</emphasis> Right-click on the "Name" header above the <guilabel>Folder
List</guilabel> and check <guilabel>Never</guilabel> under <guilabel>Display Tooltips</guilabel>.</para>
@@ -154,7 +154,7 @@
<qandaentry>
<question><para>How can I hide the message list tool tips?</para></question>
<answer>
- <para>On &kmail;, <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
+ <para>On &kmail;, <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
KMail</guisubmenu><guimenuitem>Appearance</guimenuitem><guimenuitem>Message List</guimenuitem>
</menuchoice> tab, uncheck <menuchoice><guimenu>General</guimenu><guimenuitem>Display tooltips
for messages and group headers</guimenuitem></menuchoice></para>
@@ -168,13 +168,13 @@
<!-- <qandaentry>
<question><para>How can I remove alternate line colorings?</para></question>
<answer>
-<para>In <menuchoice><guimenu>&systemsettings;</guimenu><guisubmenu>Application
-Appearance</guisubmenu><guimenuitem>Colors</guimenuitem><guimenuitem>Colors</guimenuitem></menuchoice>, for each color
-set except <guilabel>Common Colors</guilabel> (which doesn't have it), change the <guilabel>Alternate
+<para>In <menuchoice><guimenu>&systemsettings;</guimenu><guisubmenu>Application
+Appearance</guisubmenu><guimenuitem>Colors</guimenuitem><guimenuitem>Colors</guimenuitem></menuchoice>, for each color
+set except <guilabel>Common Colors</guilabel> (which doesn't have it), change the <guilabel>Alternate
Background</guilabel> to be the same as the <guilabel>Normal Background</guilabel>.</para>
-<para><emphasis>Mandriva</emphasis> and <emphasis>Mageia</emphasis> doesn't use the name <guilabel>System
-Settings</guilabel>. As in <guilabel>KControl</guilabel>, the KDE 3 control centre, they name it <quote>Configure your
-Desktop</quote> to distinguish it from <quote>Configure your Computer</quote>, a.k.a. the Mandriva/Mageia Control
+<para><emphasis>Mandriva</emphasis> and <emphasis>Mageia</emphasis> doesn't use the name <guilabel>System
+Settings</guilabel>. As in <guilabel>KControl</guilabel>, the KDE 3 control centre, they name it <quote>Configure your
+Desktop</quote> to distinguish it from <quote>Configure your Computer</quote>, a.k.a. the Mandriva/Mageia Control
Center (MCC). Other than this name change, the method is as described above.</para>
</answer>
</qandaentry> --><!-- This trick hasn't worked in a long time. @dcb2021101. -->
@@ -182,11 +182,11 @@ Center (MCC). Other than this name change, the method is as described above.</pa
<!-- FAQ #10 -->
<qandaentry id="transfer-mail-and-settings">
<question>
- <para>How do I transfer my mail and settings to another computer (or to another user account on the same
+ <para>How do I transfer my mail and settings to another computer (or to another user account on the same
machine)?</para>
</question>
<answer>
- <para>Use <menuchoice><guimenu>Tools</guimenu><guimenuitem>Import/Export &kmail; Data...</guimenuitem></menuchoice>
+ <para>Use <menuchoice><guimenu>Tools</guimenu><guimenuitem>Import/Export &kmail; Data...</guimenuitem></menuchoice>
to import and export settings and data. Please see <ulink url="help:/pimsettingexporter">PIM Setting
Exporter</ulink> for details.</para><para> </para>
</answer>
@@ -195,12 +195,12 @@ Center (MCC). Other than this name change, the method is as described above.</pa
<qandaentry>
<question><para>Why can't I copy my email folders to a USB stick?</para></question>
<answer>
- <para><emphasis>Problem:</emphasis> You are setting up a new computer and want to transfer all your mail. You
+ <para><emphasis>Problem:</emphasis> You are setting up a new computer and want to transfer all your mail. You
decide to copy everything to a USB stick. The job starts, then you get a failure message:</para>
<screen>Unable to copy ............ Invalid argument</screen>
-
- <para><emphasis>Solution:</emphasis> Your usb stick is <ulink
- url="http://wiki.linuxquestions.org/wiki/VFAT">VFAT</ulink> formatted, and therefore it can't handle
+
+ <para><emphasis>Solution:</emphasis> Your usb stick is <ulink
+ url="http://wiki.linuxquestions.org/wiki/VFAT">VFAT</ulink> formatted, and therefore it can't handle
<emphasis>maildir</emphasis> folder names (nor can it handle <emphasis>permissions</emphasis>, which can
cause many other problems). You have two choices. Either format your <acronym>USB</acronym> stick as
ext2 (or ext3 / 4 -- in which case you should be aware it can't be read by &Windows; without
@@ -242,7 +242,7 @@ Center (MCC). Other than this name change, the method is as described above.</pa
<application>PGP</application>/<application>GnuPG</application>'s error strings,
which often change between different versions.</para>
</listitem>
-
+
<listitem>
<para>&kmail; will not encrypt messages with an untrusted (unsigned) public key. If
you want to encrypt to such a key you should check the identity of the key owner and
@@ -251,11 +251,11 @@ Center (MCC). Other than this name change, the method is as described above.</pa
sign the key locally with <userinput><command>gpg</command>
<option>--lsign</option> <replaceable>keyID</replaceable></userinput>.</para>
</listitem>
-
+
<listitem>
<para>Trusting a foreign public key without checking it is not a good idea.</para>
</listitem>
-
+
<listitem>
<para>Starting with GnuPG 1.0.7 you have to set your own key to
ultimate owner trust: it is no longer implicitly done for you.</para>
@@ -275,7 +275,7 @@ Center (MCC). Other than this name change, the method is as described above.</pa
</itemizedlist>
<para>Note that some of the files are hidden: remember to also copy those if you want to backup or
archive your mails. To be safe, use <ulink url="help:/pimdataexporter">PIM Data Exporter</ulink>
- to back up your mail and your settings.</para><para> </para>
+ to back up your mail and your settings.</para><para> </para>
</answer>
</qandaentry>
@@ -310,9 +310,9 @@ Center (MCC). Other than this name change, the method is as described above.</pa
<qandaentry>
<question><para>Why doesn't &kmail; start up?</para></question>
<answer>
- <para><emphasis>Problem:</emphasis> You want to start &kmail; from a minimal desktop environment like <ulink
+ <para><emphasis>Problem:</emphasis> You want to start &kmail; from a minimal desktop environment like <ulink
url="https://en.wikipedia.org/wiki/Fvwm2">fvwm2</ulink>. It does not start.</para>
- <para><emphasis>Solution:</emphasis> This happens because you are missing <emphasis>dbus</emphasis>
+ <para><emphasis>Solution:</emphasis> This happens because you are missing <emphasis>dbus</emphasis>
functionality. Start &kmail; from a terminal window using dbus-launch, like this:</para>
<screen># dbus-launch kmail</screen><para> </para>
</answer>
@@ -345,7 +345,7 @@ Center (MCC). Other than this name change, the method is as described above.</pa
<question><para>How can I remove attachments from a message without removing
the message itself?</para></question>
<answer>
- <para>Open the context menu with a &RMB; click on an attachment and
+ <para>Open the context menu with a &RMB; click on an attachment and
select <guimenuitem>Delete Attachment</guimenuitem>.</para>
<para> </para>
</answer>
@@ -437,7 +437,7 @@ Center (MCC). Other than this name change, the method is as described above.</pa
<answer>
<para>You should only run one instance of &kmail; at a time. We also recommend
that you stick to a certain version and not switch back and forth between different versions.
- Downgrading to an older version may work, but will probably cause problems because, for instance,
+ Downgrading to an older version may work, but will probably cause problems because, for instance,
the index file formats have been changed. Upgrading should never be a problem.</para>
<para> </para>
</answer>
@@ -457,7 +457,7 @@ Center (MCC). Other than this name change, the method is as described above.</pa
<para>&kmail; tries to save your mail to
<filename class="directory">~/.local/share/kmail2/autosave/</filename>
in case of a crash. The next time you start &kmail; the mail composer should appear with your
- message again; If it does not, try to open the files in <filename
+ message again; If it does not, try to open the files in <filename
class="directory">~/.local/share/kmail2/autosave/</filename> with an editor. If there are no files in
that folder then the crash was so bad that &kmail; could not save your message.</para><para> </para>
</answer>
@@ -490,7 +490,7 @@ Center (MCC). Other than this name change, the method is as described above.</pa
<answer>
<para>Yes, but it is important to do it the right way or you might lose
mail. To use <application>procmail</application> and &kmail; you must
- set up &kmail; to fetch new mail from the spoolfiles in which
+ set up &kmail; to fetch new mail from the spoolfiles in which
<application>procmail</application> drops your mail. Do <emphasis>not</emphasis>
set up procmail to deliver mail to a &kmail; folder. This cannot work.</para>
@@ -536,7 +536,7 @@ Center (MCC). Other than this name change, the method is as described above.</pa
<para><userinput><command>ssh</command> <option>-L 11000:127.0.0.1:110
user at host</option></userinput></para>
- <para>Modify your &kmail; configuration to fetch the mail via POP3 from
+ <para>Modify your &kmail; configuration to fetch the mail via POP3 from
<userinput>localhost</userinput> and ssh will tunnel the connection for you.
</para>
@@ -716,7 +716,7 @@ Center (MCC). Other than this name change, the method is as described above.</pa
outgoing mail address</para></footnote></para>
</listitem>
<listitem>
- <para><menuchoice><guimenu>List-Id</guimenu><guimenuitem>Contains</guimenuitem></menuchoice>
+ <para><menuchoice><guimenu>List-Id</guimenu><guimenuitem>Contains</guimenuitem></menuchoice>
<replaceable>listID</replaceable><footnote><para>replace <replaceable>listID</replaceable> with
a specific mailing list id (⪚, <kdepim-users.kde.org>) or just a <quote>.</quote> to include
outgoing mail to all mailing lists with <quote>.</quote> in their id (basically all of them).</para></footnote></para>
@@ -776,9 +776,9 @@ Center (MCC). Other than this name change, the method is as described above.</pa
<qandaentry>
<question><para>How can I use E-Mail Translation?</para></question>
<answer>
- <para>To translate text in the composer window read the section
+ <para>To translate text in the composer window read the section
<link linkend="using-the-translator">Using the Built-in Translator</link></para>
- <para>In the message preview pane highlight the text you would like to translate and select
+ <para>In the message preview pane highlight the text you would like to translate and select
<guimenuitem>Translate</guimenuitem> (<keycombo action="simul">&Ctrl;&Alt;<keycap>T</keycap></keycombo>)
from the &RMB; context menu.</para><para> </para>
</answer>
diff --git a/doc/kmail2/getting-started.docbook b/doc/kmail2/getting-started.docbook
index 5dd2719dd4..f445bbd841 100644
--- a/doc/kmail2/getting-started.docbook
+++ b/doc/kmail2/getting-started.docbook
@@ -52,9 +52,9 @@ start working with it right away. For more in-depth information see the
<step id="Provide-personal-data">
<para>The first screen of the wizard is <guilabel>Provide personal data</guilabel>. It will prompt you for your basic account information: <guilabel>Full name:</guilabel>, <guilabel>E-mail address</guilabel>, and <guilabel>Password</guilabel>.
By default, the <guilabel>Find provider settings on the Internet</guilabel> option is checked, so the wizard will attempt to retrieve the necessary
- information from the email server. Uncheck this option if you are an expert user and you want to set up an advanced configuration. Click the
+ information from the email server. Uncheck this option if you are an expert user and you want to set up an advanced configuration. Click the
<guibutton>Next</guibutton> button when finished.</para>
-
+
<screenshot>
<screeninfo>Account Wizard</screeninfo>
<mediaobject>
@@ -69,17 +69,17 @@ start working with it right away. For more in-depth information see the
</caption>
</mediaobject>
</screenshot>
-
+
<note><para>GMail accounts must use &IMAP;. If you have enabled 2-step verification for your GMail account, you will have to get a
verification code from Google as part of the initial account setup process. You will not have to perform 2-factor verification
after the &kmail; account has been created, because Google marks your &IMAP; link as fully trusted.</para></note>
-
+
<para> </para> <!-- whitespace -->
</step>
<step id="GPG-security">
-
+
<para>The next screen helps you set up encryption keys for your mail.</para>
-
+
<screenshot>
<screeninfo>Account Wizard 2</screeninfo>
<mediaobject>
@@ -94,7 +94,7 @@ start working with it right away. For more in-depth information see the
</caption>
</mediaobject>
</screenshot>
-
+
<para>If you want to secure your communications with GnuPG you can generate a new key and publish the key on a public key server,
or you can import an existing key. If you decide to generate a new key pair, do not forget the password used to generate it. You will
need that password every time you want to use the key.
@@ -104,13 +104,13 @@ start working with it right away. For more in-depth information see the
</para>
<para> </para> <!-- whitespace -->
</step>
-
+
<step id="Select-account-type">
<para>A <guilabel>Setup complete</guilabel> screen will appear if the wizard determined the account type successfully.
- Click <guibutton>Details...</guibutton> to view the settings &kmail; has established. Click the <guibutton>Finish</guibutton>
+ Click <guibutton>Details...</guibutton> to view the settings &kmail; has established. Click the <guibutton>Finish</guibutton>
button to set up the account, complete the wizard, and close the window.
</para>
-
+
<screenshot>
<screeninfo>Account Wizard 3</screeninfo>
<mediaobject>
@@ -125,19 +125,19 @@ start working with it right away. For more in-depth information see the
</caption>
</mediaobject>
</screenshot>
-
+
<para>If the wizard cannot determine your account type, the <guilabel>Select Account Type</guilabel> screen will appear. Select your account type from the
list (if you do not know, you will need to contact your email provider). If your account type is not listed, click the <guibutton>Check for more on Internet</guibutton> button.
Once your account type has been selected, click the <guibutton>Next</guibutton> button, and you will be presented with the <guilabel>Personal Settings</guilabel> screen.
</para>
<para> </para> <!-- whitespace -->
</step>
-
+
<step id="Personal-settings">
-
+
<para>If the wizard could not locate your email server by searching the internet, the <guibutton>Personal Settings</guibutton>
- screen will appear.</para>
-
+ screen will appear.</para>
+
<screenshot>
<screeninfo>Account Wizard 4</screeninfo>
<mediaobject>
@@ -152,17 +152,17 @@ start working with it right away. For more in-depth information see the
</caption>
</mediaobject>
</screenshot>
-
+
<para>Be certain to enter all this information correctly. Select <guilabel>Download all messages for offline use</guilabel>
if you want your messages to be accessible when you do not have an Internet connection (&IMAP; only).
Click the <guibutton>Next</guibutton> button when finished. The <guilabel>Setup complete</guilabel> screen will appear.</para>
-
+
<para>Your account has now been set up, and you can click the <guibutton>Finish</guibutton> button to complete the wizard and close the window,
or click the <guibutton>Details...</guibutton> button to review the account settings.</para>
<para> </para> <!-- whitespace -->
</step>
</procedure>
-
+
<para>If you wish to create an account manually, please continue reading this chapter. Otherwise, you may safely skip ahead
to <link linkend="testing-your-setup">Testing your Setup</link>.</para>
@@ -185,14 +185,14 @@ start working with it right away. For more in-depth information see the
</mediaobject>
</screenshot>
<para> </para> <!-- whitespace -->
-
- <para>The <menuchoice><guimenu>Settings</guimenu><guisubmenu><inlinemediaobject><imageobject><imagedata fileref="configurebutton.png"
+
+ <para>The <menuchoice><guimenu>Settings</guimenu><guisubmenu><inlinemediaobject><imageobject><imagedata fileref="configurebutton.png"
format="PNG"/></imageobject></inlinemediaobject>Configure &kmail;...</guisubmenu></menuchoice> window consists of six sections:
<guilabel>Accounts</guilabel>, <guilabel>Appearance</guilabel>, <guilabel>Composer</guilabel>,
<guilabel>Security</guilabel>, <guilabel>Misc</guilabel>, and <guilabel>Plugins</guilabel>. </para>
<para>To begin sending and receiving messages you will only have to
- change some settings on the <guilabel>Accounts</guilabel> page.
+ change some settings on the <guilabel>Accounts</guilabel> page.
Here is a brief synopsis of the steps you must take to set up a new mail account.
For a more detailed description, please read the <link linkend="configure-generalinfo">
Configure &kmail;</link> chapter.</para>
@@ -206,7 +206,7 @@ start working with it right away. For more in-depth information see the
<para> To create a new identity, click the <guilabel>Add...</guilabel> button on the
<guilabel>Identities</guilabel> tab associated with the <guilabel>Accounts</guilabel> page.
A small pop-up window will appear.</para>
-
+
<screenshot>
<screeninfo>The new identity dialog</screeninfo>
<mediaobject>
@@ -221,12 +221,12 @@ start working with it right away. For more in-depth information see the
</caption>
</mediaobject>
</screenshot>
-
+
<para>You have some options here. Give the new identity a name, and select one of the
available choices ("With empty fields" or "Use System Settings values"). Then click
<guilabel>OK</guilabel>. The identity configuration screen will appear.</para>
<para> </para> <!-- whitespace -->
-
+
<screenshot>
<screeninfo>The new identity dialog continues</screeninfo>
<mediaobject>
@@ -242,7 +242,7 @@ start working with it right away. For more in-depth information see the
</mediaobject>
</screenshot>
<para> </para> <!-- whitespace -->
-
+
<para>
The settings in the <guilabel>General</guilabel> tab are
fairly straightforward. Fill in the <guilabel>Your
@@ -269,7 +269,7 @@ start working with it right away. For more in-depth information see the
enter your signature. This is a short bit of verbiage that will be
automatically appended to all your messages. It has nothing to
do with <emphasis>digital signatures</emphasis>. You may also wish
- to insert a small personal avatar in outgoing message headers via the
+ to insert a small personal avatar in outgoing message headers via the
<guilabel>Picture</guilabel> tab.
</para>
<para> </para> <!-- whitespace -->
@@ -290,7 +290,7 @@ start working with it right away. For more in-depth information see the
<sect2 id="sending-mail">
<title>Sending Messages</title>
<para>Here's one way to create an outgoing mail account.</para>
-
+
<screenshot>
<screeninfo>Outgoing account choices</screeninfo>
<mediaobject>
@@ -320,7 +320,7 @@ start working with it right away. For more in-depth information see the
change this later if you have more than one email account.)</para>
<para>When you select the <guilabel>&SMTP;</guilabel> option and click the
- <guibutton>✓ Create and Configure</guibutton> button, the following
+ <guibutton>✓ Create and Configure</guibutton> button, the following
configuration screen will appear.</para>
<para> </para> <!-- whitespace -->
@@ -374,7 +374,7 @@ start working with it right away. For more in-depth information see the
select <guilabel>POP3 E-Mail Server</guilabel> or <guilabel>IMAP E-Mail Server</guilabel>. If you want
to use a local mailbox file (<guilabel>Mbox</guilabel>), please see the <link linkend="faq-file-locking">FAQ
about file locking</link>.</para>
-
+
<screenshot>
<screeninfo>The receiving configuration dialog</screeninfo>
<mediaobject>
@@ -389,7 +389,7 @@ start working with it right away. For more in-depth information see the
</caption>
</mediaobject>
</screenshot>
- <para> </para> <!-- whitespace -->
+ <para> </para> <!-- whitespace -->
<para>If you chose &POP3; or &IMAP;, the account settings window will appear. First, fill in the
<guilabel>Account Name</guilabel> field to name your account. You can choose any name
@@ -411,13 +411,13 @@ start working with it right away. For more in-depth information see the
you deleted from the server as soon as you leave that folder. Otherwise,
the messages are only marked as deleted and it is up to you to compact
the folders manually.</para>
-
+
</sect3>
<sect3 id="receiving-mail-pop3">
<title>Options only relevant to POP3</title>
-
+
<para>Select <guilabel>Leave fetched messages on the server</guilabel>
on the <guilabel>Advanced</guilabel> configuration tab if you want to
leave your messages on the server after you have downloaded them. There are
@@ -425,8 +425,8 @@ start working with it right away. For more in-depth information see the
indefinitely (leave all options unselected), or number of days / number
of messages / maximum size of server side inbox (choose one, two, or all three). If
this box is not checked, all messages will be immediately deleted from the remote
- server after downloading is complete.</para>
-
+ server after downloading is complete.</para>
+
<para>On the <guilabel>Advanced</guilabel> tab you can also select <guilabel>Use
pipelining for faster mail download</guilabel> if this is supported by your
server. Test this to make sure it works safely.</para>
@@ -445,13 +445,13 @@ start working with it right away. For more in-depth information see the
<sect3 id="receiving-mail-imap-pop3">
<title>Options for both IMAP and POP3</title>
-
- <para>On the <guilabel>Receiving</guilabel> tab, under <guilabel>Retrieval Options</guilabel>,
+
+ <para>On the <guilabel>Receiving</guilabel> tab, under <guilabel>Retrieval Options</guilabel>,
select <guilabel>Include in Manual Mail Check</guilabel> if you
want to check this account whenever you invoke <menuchoice><guimenu>File</guimenu><guimenuitem>Check
Mail</guimenuitem></menuchoice>. If you do not select this option you can still check for new messages on this account
with <menuchoice><guimenu>File</guimenu><guimenuitem>Check Mail In > </guimenuitem></menuchoice>.</para>
-
+
<para>&kmail; supports encryption via <guilabel>SSL/TLS</guilabel> and
<guilabel>STARTTLS</guilabel> (<guilabel>SSL/TLS</guilabel> should be preferred
if it is available).</para>
@@ -479,7 +479,7 @@ start working with it right away. For more in-depth information see the
authentication methods. <guilabel>Anonymous</guilabel> is supported on
&IMAP;, but <guilabel>APOP</guilabel> is not. <guilabel>Gmail</guilabel>
authentication is only available for &IMAP; accounts using Google's GMail service.</para>
-
+
<para>Use the <guibutton>Auto Detect</guibutton> button on the <guilabel>Advanced</guilabel> tab
to automatically select the most secure settings supported by your server.</para>
@@ -499,7 +499,7 @@ start working with it right away. For more in-depth information see the
<para>First, you should send yourself a message to test your
configuration. To send a message, either hit <keycombo
action="simul">&Ctrl;<keycap>N</keycap></keycombo>, select the
- <guiicon><inlinemediaobject><imageobject><imagedata fileref="mail-message-new.png"
+ <guiicon><inlinemediaobject><imageobject><imagedata fileref="mail-message-new.png"
format="PNG"/></imageobject></inlinemediaobject> New</guiicon> button, or select
the <menuchoice><guimenu>Message</guimenu><guimenuitem>New
Message...</guimenuitem></menuchoice> menu item. The
diff --git a/doc/kmail2/intro.docbook b/doc/kmail2/intro.docbook
index 16c0690eaa..9730d57f43 100644
--- a/doc/kmail2/intro.docbook
+++ b/doc/kmail2/intro.docbook
@@ -53,7 +53,7 @@ section first.</para>
be done with <link linkend="keyboard-shortcuts">Keyboard Shortcuts</link>.</para>
</listitem>
<listitem>
-<para>Although &kmail; is very reliable, you should keep
+<para>Although &kmail; is very reliable, you should keep
backups of your messages, &ie;, use one of the export/archive options listed in <link
linkend="backups">Backup Options</link> to back up your settings and email regularly.</para>
</listitem>
@@ -81,7 +81,7 @@ for details.</para>
<para>We hope you will enjoy &kmail;!</para>
<sect2 id="getting-help">
<title>Getting Help</title>
-
+
<para>&kmail;'s homepage can be found at <ulink url="https://apps.kde.org/kmail2/">https://apps.kde.org/kmail2/</ulink>. There you will
find useful links (⪚, to the user and developer mailing lists, and to the community wiki pages.) Please report any bugs in &kmail; using
<menuchoice><guimenu>Help</guimenu><guimenuitem>Report Bug...</guimenuitem></menuchoice>.</para>
diff --git a/doc/kmail2/menus.docbook b/doc/kmail2/menus.docbook
index c1e456755c..a01daa6ac9 100644
--- a/doc/kmail2/menus.docbook
+++ b/doc/kmail2/menus.docbook
@@ -249,7 +249,7 @@ performs a menu item function, the default shortcut is listed with the menu item
The items listed here are &kmail; specific.</para>
<variablelist>
-
+
<varlistentry id="reader-edit-copy-folder">
<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>C</keycap></keycombo></shortcut>
<guimenu>Edit</guimenu><guimenuitem>Copy Folder</guimenuitem></menuchoice></term>
@@ -355,7 +355,7 @@ performs a menu item function, the default shortcut is listed with the menu item
<varlistentry id="reader-view-message-list">
<term><menuchoice><guimenu>View</guimenu><guisubmenu>Message List ></guisubmenu></menuchoice></term>
<listitem><para>This submenu has the following options to change the appearance of the message list.</para>
-
+
<variablelist>
<varlistentry id="reader-view-messagelist-sorting">
<term><menuchoice><guisubmenu>Sorting ></guisubmenu></menuchoice></term>
@@ -366,13 +366,13 @@ performs a menu item function, the default shortcut is listed with the menu item
<itemizedlist>
<listitem><para><guilabel>By Smart Sender/Receiver</guilabel> will display the receiver when you are
viewing the sent-mail folder, and will display the sender when you are viewing the inbox.</para></listitem>
-
+
<listitem><para><guilabel>By Action Item Status</guilabel> and <guilabel>By Important Status</guilabel>.
These flags need to be set before they can be sorted. Please see <link linkend="reader-mark-messages">Mark
Messages</link> for more information on marking your messages.</para></listitem>
</itemizedlist>
</listitem>
-
+
<listitem><para><guilabel>Message Sort Direction</guilabel> and <guilabel>Group Sort Direction</guilabel>
allow you to change the direction in which your messages/groups will be sorted, respectively. Note
that the "Group" options are only available when messages are aggregated into groups.</para></listitem>
@@ -381,7 +381,7 @@ performs a menu item function, the default shortcut is listed with the menu item
</itemizedlist>
</listitem>
</varlistentry>
-
+
<varlistentry id="reader-view-messagelist-aggregation">
<term><menuchoice><guisubmenu>Aggregation ></guisubmenu></menuchoice></term>
<listitem><para>Lets you select an aggregation option. Please see the <link
@@ -389,7 +389,7 @@ performs a menu item function, the default shortcut is listed with the menu item
<guimenu>Settings</guimenu><guisubmenu>Configure &kmail;...</guisubmenu></menuchoice>) for more
information on aggregation.</para></listitem>
</varlistentry>
-
+
<varlistentry id="reader-view-messagelist-theme">
<term><menuchoice><guisubmenu>Theme ></guisubmenu></menuchoice></term>
<listitem><para>Lets you select a theme. Please see the <link
@@ -397,7 +397,7 @@ performs a menu item function, the default shortcut is listed with the menu item
<guimenu>Settings</guimenu><guisubmenu>Configure &kmail;...</guisubmenu></menuchoice>) for more
information on themes.</para></listitem>
</varlistentry>
-
+
<varlistentry id="reader-view-messagelist-create-new-tab">
<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>O</keycap></keycombo></shortcut>
<guisubmenu>Create New Tab</guisubmenu></menuchoice></term>
@@ -406,31 +406,31 @@ performs a menu item function, the default shortcut is listed with the menu item
option will create it. The tabbing toolbar can be handy if you have many folders, but only a few of
them are regularly accessed.</para></listitem>
</varlistentry>
-
+
<varlistentry id="reader-view-messagelist-activate-next-tab">
<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&PgDn;</keycombo></shortcut>
<guisubmenu>Activate Next Tab</guisubmenu></menuchoice></term>
<listitem><para>Opens the folder associated with the next tab on the tabbing toolbar.</para></listitem>
</varlistentry>
-
+
<varlistentry id="reader-view-messagelist-activate-previous-tab">
<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&PgUp;</keycombo></shortcut>
<guisubmenu>Activate Previous Tab</guisubmenu></menuchoice></term>
<listitem><para>Opens the folder associated with the previous tab on the tabbing toolbar.</para></listitem>
</varlistentry>
-
+
<varlistentry id="reader-view-messagelist-move-tab-left">
<term><menuchoice><guisubmenu>Move Tab Left</guisubmenu></menuchoice></term>
<listitem><para>Reorders the tabs on the tabbing toolbar by shifting the active tab to the left.
If that tab is already at the extreme left end, it will be moved to the right hand end position.</para></listitem>
</varlistentry>
-
+
<varlistentry id="reader-view-messagelist-move-tab-right">
<term><menuchoice><guisubmenu>Move Tab Right</guisubmenu></menuchoice></term>
<listitem><para>Reorders the tabs on the tabbing toolbar by shifting the active tab to the right.
If that tab is already at the extreme right end, it will be moved to the left hand end position.</para></listitem>
</varlistentry>
-
+
<varlistentry id="reader-view-messagelist-close-tab">
<term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>W</keycap></keycombo></shortcut>
<guisubmenu>Close Tab</guisubmenu></menuchoice></term>
@@ -734,7 +734,7 @@ performs a menu item function, the default shortcut is listed with the menu item
<varlistentry id="reader-folder-mailing-list-management">
<term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Mailing List Management...</guimenuitem></menuchoice></term>
<listitem><para>This opens the mailing list management dialog. This option is only available if
- the current folder contains messages from a mailing list. Please see the <link
+ the current folder contains messages from a mailing list. Please see the <link
linkend="folders-properties-mailinglist">Mailing List dialog</link> for more
information on mailing lists.</para></listitem>
</varlistentry>
@@ -903,14 +903,14 @@ performs a menu item function, the default shortcut is listed with the menu item
<varlistentry id="reader-message-mailing-list">
<term><menuchoice><guimenu>Message</guimenu><guimenuitem>Mailing List Name: ></guimenuitem></menuchoice></term>
-
+
<listitem><para>Offers several options for mailing list messages.</para>
<note><para>The current working folder must be configured as a mailing list for this
option to be available. Please see <link linkend="folders-properties-mailinglist">Folder
Properties Mailing List</link> to learn about setting up mailing lists.</para></note>
<para> </para><!-- add whitespace -->
<para>The following options are available in mailing list folders:</para>
-
+
<itemizedlist>
<listitem><para><guimenuitem>Post New Message(email)</guimenuitem> will set the
<guilabel>To:</guilabel> address to the address configured as "Post to List".</para></listitem>
@@ -928,7 +928,7 @@ performs a menu item function, the default shortcut is listed with the menu item
<guilabel>To:</guilabel> address to the mailing list subscription address, and place the
word <literal>unsubscribe</literal> in the <guilabel>Subject:</guilabel> field.</para></listitem>
</itemizedlist>
-
+
<para> </para><!-- add whitespace --></listitem>
</varlistentry>
@@ -972,7 +972,7 @@ performs a menu item function, the default shortcut is listed with the menu item
</inlinemediaobject></entry>
<entry>This status will not automatically be set by &kmail;.
You can use it freely to mark messages that are in some way important to you.</entry></row>
-
+
<row>
<entry><guimenuitem>Remove Important Mark</guimenuitem></entry>
<entry><inlinemediaobject><imageobject><imagedata fileref="mail-mark-important.png" format="PNG"/></imageobject>
@@ -1001,7 +1001,7 @@ performs a menu item function, the default shortcut is listed with the menu item
<listitem><para>Lets you change the status of all messages in a thread as follows:</para>
<informaltable><tgroup cols="3">
<thead><row><entry>Status</entry><entry>Symbol</entry><entry>Meaning</entry></row></thead>
-
+
<tbody>
<row>
<entry><guimenuitem>Mark Thread as Read</guimenuitem></entry>
@@ -1021,7 +1021,7 @@ performs a menu item function, the default shortcut is listed with the menu item
</inlinemediaobject></entry>
<entry>This status will not automatically be set by &kmail;. You can use it freely to mark threads
that are in some way important to you.</entry></row>
-
+
<row>
<entry><guimenuitem>Remove Important Thread Mark</guimenuitem></entry>
<entry><inlinemediaobject><imageobject><imagedata fileref="mail-mark-important.png" format="PNG"/></imageobject>
@@ -1034,7 +1034,7 @@ performs a menu item function, the default shortcut is listed with the menu item
</inlinemediaobject></entry>
<entry>This status will not automatically be set by &kmail;. Use this to mark threads that are
action items (⪚, a to-do list).</entry></row>
-
+
<row>
<entry><guimenuitem>Remove Action Item Thread Mark</guimenuitem></entry>
<entry><inlinemediaobject><imageobject><imagedata fileref="mail-mark-task.png" format="PNG"/></imageobject>
@@ -1049,14 +1049,14 @@ performs a menu item function, the default shortcut is listed with the menu item
selecting the <guimenu>Watched</guimenu> status in the drop down box found in the Quick Search Bar.
(Click on the <inlinemediaobject><imageobject><imagedata fileref="view-filter.png" format="PNG"/>
</imageobject></inlinemediaobject> icon to display the filterable categories.)</entry></row>
-
+
<row>
<entry><guimenuitem>Ignore Thread</guimenuitem></entry>
<entry><inlinemediaobject><imageobject><imagedata fileref="mail-thread-ignored.png" format="PNG"/></imageobject>
</inlinemediaobject></entry>
<entry>Allows you to ignore entire threads.</entry></row>
</tbody>
-
+
</tgroup></informaltable>
<para> </para><!-- add whitespace --></listitem>
</varlistentry>
@@ -1115,7 +1115,7 @@ performs a menu item function, the default shortcut is listed with the menu item
linkend="configure-plugins-tools">Expert Plugin</link> has been activated.</para>
<para> </para></listitem>
</varlistentry>
-</variablelist>
+</variablelist>
</sect2>
@@ -1249,7 +1249,7 @@ performs a menu item function, the default shortcut is listed with the menu item
</screenshot>
<para> </para><!-- add whitespace -->
-<para>If the menu item you are looking for is missing, please see <ulink
+<para>If the menu item you are looking for is missing, please see <ulink
url="help:/fundamentals/menus.html#menus-settings">Settings Menu</ulink> in &kde;
Fundamentals. The items listed here are &kmail; specific.</para>
<variablelist>
@@ -1575,7 +1575,7 @@ url="help:/fundamentals/menus.html#menus-edit">Edit Menu</ulink> section of the
<listitem><para>Lets you insert a special character at the cursor position. A large number of Unicode
characters are made available. This option is only provided if the <guimenuitem>Insert Special
Character</guimenuitem> plugin has been activated.</para>
-
+
<para>This menu item was moved to the <guimenu>Insert</guimenu> menu in release 5.17. If you have activated
the plugin, and this entry does not appear when &kmail; is restarted, check the <guimenu>Insert</guimenu>
menu.</para></listitem>
@@ -1672,7 +1672,7 @@ composer window. Selected items will be marked (check box colored in) in the men
it to select <guilabel>CC</guilabel>, <guilabel>BCC</guilabel>, and <guilabel>Reply-To</guilabel>
addresses, as needed. Please see <link linkend="composer-headers">Composer Headers</link> for
further details on message headers.</para>
-
+
<para> </para>
<variablelist>
@@ -1689,7 +1689,7 @@ composer window. Selected items will be marked (check box colored in) in the men
snippets. Please see <link linkend="setup-text-snippets">Snippets</link> for more information.</para>
<para> </para></listitem>
</varlistentry>
-
+
</variablelist>
</sect2>
@@ -1767,7 +1767,7 @@ items will be marked (check box colored in) in the menu.</para>
<varlistentry id="composer-options-select-crypto-message-format">
<term><menuchoice><guimenu>Options</guimenu><guisubmenu>Cryptographic Message Format ></guisubmenu></menuchoice></term>
<listitem><para>Lets you choose the cryptographic message format to use when
- digitally signing and/or encrypting this message. Please see <link
+ digitally signing and/or encrypting this message. Please see <link
linkend="cryptographic-message-formats">Cryptographic Message
Formats</link> for more information.</para></listitem>
</varlistentry>
@@ -1944,11 +1944,11 @@ items will be marked (check box colored in) in the menu.</para>
<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/menus.html#menus-tools">Tools Menu</ulink> of the &kde; Fundamentals.
The items listed here are &kmail; specific.</para>
-
+
<variablelist>
<varlistentry id="composer-tools-select-recipients">
<term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Select Recipients...</guimenuitem></menuchoice></term>
- <listitem><para>Opens a <guilabel>Select Recipient</guilabel> dialog, with
+ <listitem><para>Opens a <guilabel>Select Recipient</guilabel> dialog, with
the contents of all your address books to select from.</para></listitem>
</varlistentry>
@@ -2012,7 +2012,7 @@ items will be marked (check box colored in) in the menu.</para>
<para>If the menu item you seek is missing, please see <ulink url="help:/fundamentals/menus.html#menus-settings">Settings
Menu</ulink> of the &kde; Fundamentals. The items listed here are &kmail; specific.</para>
-
+
<variablelist>
<varlistentry id="composer-settings-toolbars">
<term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Toolbars Shown ></guimenuitem></menuchoice></term>
diff --git a/doc/kmail2/troubleshooting.docbook b/doc/kmail2/troubleshooting.docbook
index d967e5c2f6..555ec4bd66 100644
--- a/doc/kmail2/troubleshooting.docbook
+++ b/doc/kmail2/troubleshooting.docbook
@@ -22,25 +22,25 @@
<sect1 id="introduction-to-akonadi">
<title>Introduction to &akonadi;</title>
-
+
<para>&kmail; has been under active development since 1997. A lot of bugs have cropped up over the years.
Many of these have been resolved. If you are curious about any of those old bugs, please see the <ulink
url="https://userbase.kde.org/Special:MyLanguage/KMail/FAQs_Hints_and_Tips">KMail/FAQs Hints and Tips</ulink>
in the &kde; UserBase Wiki. Or visit <ulink url="https://bugs.kde.org">&kde;'s main bug tracking page</ulink>
to learn about bugs of a more recent vintage.</para>
-
+
<para>At the present time (2021), many of the problems people are experiencing with &kmail; involve the &akonadi;
server. &akonadi; is an auxiliary program that functions as an intermediary between &kmail; (plus all the other &PIM;
applications) and a general purpose database daemon (most commonly "mysqld"). It also facilitates inter-process
communications among the various pieces of the &PIM; applications. Depending on the way your system is configured,
- &akonadi; may be started during the boot-up / login process. Or it may not start until you invoke a &PIM;
+ &akonadi; may be started during the boot-up / login process. Or it may not start until you invoke a &PIM;
application program (like &kmail;, or &kaddressbook;, or &kontact;).</para>
-
+
<para> There are two application programs that permit one to interact with the &akonadi; server directly: <code>akonadictl</code>
(a terminal-oriented control program), and <code>akonadiconsole</code> (a GUI application). Here is a little information about
those two programs.</para>
<para> </para><!-- add whitespace -->
-
+
<sect2 id="intro-to-akonadictl">
<title>The Akonadictl Control Program</title>
<screenshot>
@@ -58,10 +58,10 @@
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<para>The preceding screenshot illustrates one of the commands one may use with the <code>akonadictl</code> program. Here
are all the commands <code>akonadictl</code> recognizes.</para>
-
+
<para><screen>~$ akonadictl start</screen> Starts the &akonadi; server.</para>
<para><screen>~$ akonadictl stop</screen> Stops the &akonadi; server.</para>
<para><screen>~$ akonadictl restart</screen> Stops the &akonadi; server, then launches it anew.</para>
@@ -69,12 +69,12 @@
<para><screen>~$ akonadictl instances</screen> Lists the &akonadi; server instances (more than one can
be running at the same time).</para>
<para><screen>~$ akonadictl vacuum</screen> Cleans up &akonadi;'s storage, or at least tries to do that.</para>
- <para><screen>~$ akonadictl fsck</screen> Performs a file consistency check. The output from this
+ <para><screen>~$ akonadictl fsck</screen> Performs a file consistency check. The output from this
command can be quite voluminous, especially if you have added your own folders to &kmail;. Use this
version of the command (piping the output through grep) to verify that your &akonadi; database is healthy,
without producing a lot of extraneous output.</para>
<para>
-
+
<screen>~ $ akonadictl fsck 2>&1 | grep ^Found
Found 0 external files.
Found 0 external parts.
@@ -87,13 +87,13 @@ Found 0 dirty items.</screen> <!-- Can't indent here ... messes up the output.
RID stands for RemoteId, a named field in the mysql database tables. If there are more than 0 items
without RID, you have a minor problem that should be corrected. If there are more than 0 dirty items
- you may have a major problem that <emphasis>must</emphasis> be corrected. See <link
+ you may have a major problem that <emphasis>must</emphasis> be corrected. See <link
linkend="resource-conflict-error">"Unable to Fetch Item ..."</link> and also <link
linkend="dealing-with-dirt">Correcting &kmail;'s "Dirty" Items</link>, below.
</para>
<para> </para><!-- add whitespace -->
</sect2>
-
+
<sect2 id="intro-to-akonadiconsole">
<title>The Akonadiconsole Program</title>
<screenshot>
@@ -111,82 +111,82 @@ Found 0 dirty items.</screen> <!-- Can't indent here ... messes up the output.
</mediaobject>
</screenshot>
<para> </para><!-- add whitespace -->
-
+
<para>The <code>akonadiconsole</code> program provides twelve different "windows" into the inner
workings of the &PIM; applications. Here is a brief summary of the available views.</para>
-
+
<variablelist>
<varlistentry id="ak-console-agents">
<term><guilabel>Agents</guilabel> tab.</term>
<listitem><para>Here you can see a list of the user agents (processors).</para></listitem>
</varlistentry>
-
+
<varlistentry id="ak-console-browser">
<term><guilabel>Browse</guilabel> tab.</term>
<listitem><para>This tab provides an overview of the various collections of data &akonadi;
is maintaining, organized as a hierarchical tree that shows how many items reside in each
collection.</para></listitem>
</varlistentry>
-
+
<varlistentry id="ak-console-debugger">
<term><guilabel>Debugger</guilabel> tab.</term>
<listitem><para>Here you can turn debugging on and off, and view the debug message log.</para></listitem>
</varlistentry>
-
+
<varlistentry id="ak-console-logging">
<term><guilabel>Logging</guilabel> tab.</term>
<listitem><para>This tab lets you view messages emitted by various &akonadi; components.</para></listitem>
</varlistentry>
-
+
<varlistentry id="ak-console-db-browser">
<term><guilabel>DB Browser</guilabel> tab.</term>
<listitem><para>Use this tab to peek inside the mysql database. There are many different tables.</para></listitem>
</varlistentry>
-
+
<varlistentry id="ak-console-db-console">
<term><guilabel>DB Console</guilabel> tab.</term>
<listitem><para>Here you can query the mysql database.</para></listitem>
</varlistentry>
-
+
<varlistentry id="ak-console-query">
<term><guilabel>Query Debugger</guilabel> tab.</term>
<listitem><para>Use this tab to turn database query debugging on and off. &kmail; queries the mysql
database many times in just a few seconds; output can be voluminous.</para></listitem>
</varlistentry>
-
+
<varlistentry id="ak-console-tracker">
<term><guilabel>Job Tracker</guilabel> tab.</term>
<listitem><para>The &PIM; applications perform various functions by initiating "jobs". Use
this tab to toggle job tracking on and off.</para></listitem>
</varlistentry>
-
+
<varlistentry id="ak-console-scheduler">
<term><guilabel>Resources Schedulers</guilabel> tab.</term>
<listitem><para>Here you can see which resources are needed when a particular &PIM; function is
invoked. You can see a list of all the &akonadi; resources in your system in the
<filename>~/.config/akonadi/</filename> directory.</para></listitem>
</varlistentry>
-
+
<varlistentry id="ak-console-notif-monitor">
<term><guilabel>Notification Monitor</guilabel> tab.</term>
<listitem><para>Use this tab to monitor notifications sent by various &akonadi; resources.</para></listitem>
</varlistentry>
-
+
<varlistentry id="ak-console-search">
<term><guilabel>Item Search</guilabel> tab.</term>
<listitem><para>This tab provides a generic search function. Searches can be restricted to Calendar, Contact,
Email, or Note.</para></listitem>
</varlistentry>
-
+
<varlistentry id="ak-console-monitors">
<term><guilabel>Monitors</guilabel> tab.</term>
<listitem><para>Here you can see a list of all the monitors running under &akonadi;, and also view
their properties. Agents, resources, and even some application programs are monitored.</para></listitem>
</varlistentry>
</variablelist>
-
+
</sect2>
-
+
</sect1>
<!-- <sect1 id="kmail2-doesnt-send-mail">
@@ -332,7 +332,7 @@ DefaultResourceId=akonadi_maildir_resource_0</userinput>
<title>"Unable to Fetch Item from Backend" When Entering &IMAP; Folder</title>
<para>There are at least two possible reasons for this. Here are some workarounds.</para>
-
+
<variablelist>
<varlistentry>
<term>Workaround 1</term>
@@ -344,7 +344,7 @@ DefaultResourceId=akonadi_maildir_resource_0</userinput>
<para>If this does not work, try workaround 2 (below).</para>
</listitem>
</varlistentry>
-
+
<varlistentry>
<term>Workaround 2</term>
<listitem>
@@ -361,7 +361,7 @@ DefaultResourceId=akonadi_maildir_resource_0</userinput>
</listitem>
</varlistentry>
</variablelist>
- <para>See also <link linkend="your-mails-are-not-being-sent">the next topic</link> to learn how
+ <para>See also <link linkend="your-mails-are-not-being-sent">the next topic</link> to learn how
<application>akonadiconsole</application> can be helpful.</para>
</sect1>
@@ -374,23 +374,23 @@ DefaultResourceId=akonadi_maildir_resource_0</userinput>
<para>To remedy this, it might help to abort the current action and restart it. First, quit &kmail; by using &krunner;
(<keycombo>&Alt;<keycap>F2</keycap></keycombo>) or &konsole; and typing: <userinput><command>kquitapp kmail</command></userinput> .
Note that a normal <keycombo>&Alt;<keycap>F4</keycap></keycombo> or <menuchoice><guimenu>File</guimenu><guimenuitem>Quit</guimenuitem>
- </menuchoice> does <emphasis>not</emphasis> do the trick! Wait a minute, then start &kmail; again. Now start
+ </menuchoice> does <emphasis>not</emphasis> do the trick! Wait a minute, then start &kmail; again. Now start
<application>akonadiconsole</application> using &krunner; (<keycombo>&Alt;<keycap>F2</keycap></keycombo>) or &konsole;. Go to the
<guilabel>Mail Dispatcher Agent</guilabel> (under the <guilabel>Agents</guilabel> tab), do a right-click, and abort the current action.
You will most likely get some error messages popping up. Now go back to &kmail; and choose <menuchoice><guimenu>File</guimenu>
<guimenuitem>Send Queued Messages</guimenuitem></menuchoice>. Now it might work. If not, instead of aborting the current action,
try toggling the offline/online status of the <guilabel>Mail Dispatcher Agent</guilabel> (same context menu) or restarting things
as mentioned in workaround 2 of <link linkend="unable-to-fetch-item-from-backend"> the previous topic</link>.</para>
-
+
<para><note><para>akonadiconsole can be quite helpful for a number of situations because it shows all the <quote>agents</quote>,
the separate components of the &kmail; backend. You can stop and start them, put them in offline mode, abort ongoing actions &etc;.
It can be very helpful when &kmail; is acting cranky.</para></note></para>
-
+
<para>Sometimes the <guilabel>Mail Dispatcher Agent</guilabel> fails to function because the dbus daemon (a system-level
facility for inter-process communications) is not functioning correctly. Your best bet in this circumstance is simply to
reboot the system. The dbus daemon is one of the first processes started when you log in to the &kde; desktop, so it
cannot be easily stopped and restarted. The whole &plasma; environment depends on it.</para>
-
+
</sect1>
<sect1 id="resource-conflict-error">
@@ -422,10 +422,10 @@ Found 0 dirty items.</screen> <!-- Can't indent here ... messes up the output.
<step><para>You need to know how to connect directly to the mysql server. Use the <code>ps</code> and
<code>grep</code> commands to do this.
<screen>~ $ ps ux | grep mysql
-david 8788 0.2 0.9 3736292 153936 ? Sl 06:45 0:16 /usr/sbin/mysqld
+david 8788 0.2 0.9 3736292 153936 ? Sl 06:45 0:16 /usr/sbin/mysqld
--defaults-file=/home/david/.local/share/akonadi/mysql.conf
---datadir=/home/david/.local/share/akonadi/db_data/
---socket=/run/user/1000/akonadi/mysql.socket
+--datadir=/home/david/.local/share/akonadi/db_data/
+--socket=/run/user/1000/akonadi/mysql.socket
--pid-file=/run/user/1000/akonadi/mysql.pid
david 24275 0.0 0.0 8056 2144 pts/1 S+ 08:24 0:00 grep --colour=auto mysql</screen></para>
<para> </para><!-- add whitespace --></step>
@@ -455,9 +455,9 @@ Bye</screen>
say "mysql --socket= ..." you will be in a dialog with the mysql server (aka "MariaDB"), which provides a > prompt.
The entire dialog is presented here, for clarity. User input lines are marked with <== in the preceding
illustration.</para></step>
-
+
</procedure>
-
+
<para>When you restart &kmail;, those pesky duplicate messages will be gone. They were merely phantoms caused by the NULL
pointers in the mysql database tables.</para>
@@ -465,9 +465,9 @@ Bye</screen>
<sect1 id="cleaning-aux-storage">
<title>Keeping &kmail;'s Auxiliary Storage Areas Clean</title>
-
+
<para>&kmail; stores data in several different places on your machine. Most of these places are inside the
- <filename>~/.local/share/</filename> directory somewhere. For instance, on most Linux distros, your
+ <filename>~/.local/share/</filename> directory somewhere. For instance, on most Linux distros, your
<guilabel>Local Folders</guilabel> are in <filename>~/.local/share/local-mail/</filename> . &akonadi; stores
most of its data in <filename>~/.local/share/akonadi/</filename> .
<screen>~ $ cd .local/share/akonadi
@@ -481,7 +481,7 @@ Akonadi.error.old db_misc file_lost+found search_db
the mysqld daemon that serves as &akonadi;'s backend. The two directories <filename>db_data</filename> and
<filename>search_db</filename> contain the actual mysql database tables. There are also a couple of mysql
log files in <filename>db_data</filename> that might be helpful if and when &akonadi; acts up.</para>
-
+
<para>The two directories <filename>file_db_data</filename> and <filename>file_lost+found</filename> contain auxiliary
data associated with asynchronous processing. &akonadi; does not automatically clean out the
<filename>file_lost+found</filename> directory, so you may wish to clean those files up manually from time to time
@@ -507,7 +507,7 @@ Found 6 collections without RID.
Found 0 items without RID.
Found 750 dirty items.</screen> <!-- Can't indent here ... messes up the output. -->
</para>
-
+
<para>The "dirty" flag on an item in pimitemtable (one of the tables in the &akonadi; database) is used to control certain
aspects of asynchronous processing. It is set true when there are operations pending for a particular email message. Most
of the time, the "dirty" flag is cleared one or two seconds later, when the once pending operation finishes up.</para>
@@ -524,37 +524,37 @@ Found 750 dirty items.</screen> <!-- Can't indent here ... messes up the output.
<procedure>
<step><para>Exit &kmail; and stop the &akonadi; server with a terminal command: <code>akonadictl stop</code> .</para></step>
-
+
<step><para>Make a backup copy of all your email messages. You may be able to use <ulink url="help:/pimdataexporter">PIM
Data Exporter</ulink> for this purpose. Or you may use &ark; to make an archive, or &dolphin; to make a second copy of
<filename>~/.local/share/local-mail/</filename> somewhere else on your hard disk. If you're adventurous, you might just
rename your local folders directory to something like <filename>local-mail-save</filename> . But it's safer to be sure
you have a backup copy of your messages before you proceed.</para></step>
-
+
<step><para>You should also make a backup copy of any filters you have created, and make sure you know how to restore any
custom <guilabel>Sent mail folder</guilabel>, <guilabel>Drafts folder</guilabel>, or <guilabel>Templates folder</guilabel>
entries associated with your &kmail; identities. The next step will remove all your personally customized mail folders,
and you will need to patch some stuff up after &akonadi; rebuilds its database tables.</para></step>
-
+
<step><para>Now delete all the folders inside of the directory <filename>local-mail</filename>, or rename that directory
to something like <filename>local-mail-save</filename> . Then start the &kmail; program. This will force &akonadi; to
erase all the database table entries associated with email messages. You will see your old folder names, briefly, but these
will disappear when &akonadi; finishes deleting all the "dirty" items (and all the clean ones, too).</para></step>
-
+
<step><para>Exit &kmail; and stop the &akonadi; server as explained in step 1, then restore the backup copy of your messages
(created in step 2) to the <filename>~/.local/share/local-mail/</filename> directory.</para></step>
-
+
<step><para>Start &kmail; up again, and force &akonadi; to re-sync the database. The easiest way to do this is to <menuchoice>
<shortcut><keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo></shortcut><guimenu>File</guimenu><guimenuitem>Check
Mail</guimenuitem></menuchoice>; &akonadi; automatically re-syncs all the folders when it fetches mail. This will take several
minutes to complete, depending on how many messages you have saved in your &kmail; folders. But when the process is complete
all the "dirty" items will be gone.</para></step>
-
+
<step><para>Finally, you will want to restore your mail filter rules backed up in step 3, and check that all the custom folder
items (<guilabel>Sent mail folder</guilabel>, &etc;) for your identities are set the way you want them. You will also need
to reset any custom folder properties you had set up, and you will probably have a bunch of spurious "Unread Message"
notifications to deal with. But your &akonadi; database tables will be all clean and shiny once again!</para></step>
-
+
</procedure>
diff --git a/doc/kmail2/using-kmail.docbook b/doc/kmail2/using-kmail.docbook
index 6a5664a78a..cb13dff9f4 100644
--- a/doc/kmail2/using-kmail.docbook
+++ b/doc/kmail2/using-kmail.docbook
@@ -53,7 +53,7 @@ when &kmail; is started. It is by default divided into three panes:</para>
may call them mailboxes). To select a folder, simply click on
it. The message header information contained in the folder will then appear in the Message List
pane. The folder list can be displayed in both a short view, which takes up only
-a small portion of the left side of the screen, and a long view, which takes up the
+a small portion of the left side of the screen, and a long view, which takes up the
entire left side of the screen (and can show more folders). You can toggle
between these two views by using the <guilabel>Appearance</guilabel>/<guilabel>Layout</guilabel> tab
in the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
@@ -125,7 +125,7 @@ see <link linkend="customize-messagelist-theme">Configure Appearance of Message
<para> </para> <!-- whitespace -->
<anchor id="the-preview-pane-headers" />
<para>This pane displays the currently selected message. Here are some ways to adjust the Preview pane.</para>
-<para>The top of the Preview pane displays the message headers. Several display options are available. Go to
+<para>The top of the Preview pane displays the message headers. Several display options are available. Go to
<menuchoice><guimenu>View</guimenu><guisubmenu>Headers</guisubmenu></menuchoice>
and try them out until you find one you like!</para>
<itemizedlist id="using-header-options">
@@ -158,7 +158,7 @@ For example, if you attach an HTML file to a plain text message, &kmail; will pr
different formats, even though this is not really the case. Similarly, &HTML; messages may display embedded images even when you have
selected the "Hide" option for attachments.</para>
-<para>The structure of each message can be displayed by pressing <keycombo
+<para>The structure of each message can be displayed by pressing <keycombo
action="simul">&Ctrl;&Alt;<keycap>D</keycap></keycombo>. This will open a message structure viewer below the preview pane.
Turn the message structure viewer off by pressing the same three keys.</para>
@@ -311,10 +311,10 @@ to using <keycombo action="simul">&Ctrl;&Home;</keycombo> or
</row>
<row>
<entry><keycombo action="simul">&Shift;<keycap>H</keycap></keycombo></entry>
-<entry>Toggle between plain text and &HTML; (unless &HTML; has been preferred
+<entry>Toggle between plain text and &HTML; (unless &HTML; has been preferred
via the <guilabel>Settings</guilabel> dialog).</entry>
</row>
-<row>
+<row>
<entry><keycombo action="simul">&Shift;<keycap>←</keycap></keycombo> &
<keycombo action="simul">&Shift;<keycap>→</keycap></keycombo></entry>
<entry>Select messages sequentially in the message list, starting with the current message.</entry>
@@ -328,9 +328,9 @@ Shortcuts...</guimenuitem></menuchoice> dialog. If you're not happy with the def
<para>Two mouse actions deserve mention here. First, you can select multiple noncontiguous messages to be processed
all at once (⪚ copied, deleted, or moved) by pressing &Ctrl; and selecting them with the &LMB;. Second, you
-can open a message in an external window by double-clicking an item in the message list. If the message is in
+can open a message in an external window by double-clicking an item in the message list. If the message is in
the outbox, drafts, or templates folder, it will be opened in a composition window. Otherwise, it will be opened
-with the external message viewer, an abbreviated version of &kmail;'s main window without the folder and
+with the external message viewer, an abbreviated version of &kmail;'s main window without the folder and
message lists, and with shorter menus.</para>
</sect1>
@@ -415,14 +415,14 @@ select one or more people who should receive this message.</para>
<para>Alternatively, when you start typing an address in one of the
<guilabel>To:</guilabel>/<guilabel>CC:</guilabel>/<guilabel>BCC:</guilabel>
fields, a popup will appear that suggests similar recently used addresses
-and closely matching addresses from &kaddressbook;; if you do not like this automatic
-popup, you can disable it by clicking the &RMB; in the field where you're typing, then choosing
+and closely matching addresses from &kaddressbook;; if you do not like this automatic
+popup, you can disable it by clicking the &RMB; in the field where you're typing, then choosing
a different <guilabel>Text Completion ></guilabel> mode. You can also use this context menu to fine-tune the
order in which suggested completions appear (via <guilabel>Configure Completion...</guilabel>).</para>
<para>Whenever you want to add more than one
recipient in one of the fields, use a comma to separate one address
-from the next one.
+from the next one.
<!-- fixme: there's now a setting for this: -->
You may have to specify fully qualified addresses
(&ie; <userinput>user at example.com</userinput>) even for local
@@ -437,7 +437,7 @@ to save it for later editing.
If you want to print your message, select <menuchoice><guimenu>Message</guimenu><guimenuitem>Print Preview</guimenuitem></menuchoice>
to preview the message, and <menuchoice><guimenu>Message</guimenu><guimenuitem>Print</guimenuitem></menuchoice> to print it.</para>
<para id="send-later"><menuchoice><guimenu>Message</guimenu><guimenuitem>Send Later</guimenuitem></menuchoice>
- lets you schedule your emails to be sent at a specific date and time. Please see
+ lets you schedule your emails to be sent at a specific date and time. Please see
<ulink url="help:/akonadi_sendlater_agent">Send Later Agent</ulink> for details.</para>
<para> </para> <!-- whitespace -->
</listitem>
@@ -468,7 +468,7 @@ or <link linkend="pgp-sign-your-messages">digitally signed</link> message, selec
</imageobject></inlinemediaobject> Sign</guiicon> and / or <guiicon><inlinemediaobject><imageobject><imagedata
fileref="document-decrypt.png" format="PNG"/></imageobject></inlinemediaobject> Encrypt</guiicon> icon in the toolbar.
Use the <menuchoice><guimenuitem>Options</guimenuitem><guisubmenu>Cryptographic Message
-Format ></guisubmenu></menuchoice> dropdown list to select the format used to encrypt the
+Format ></guisubmenu></menuchoice> dropdown list to select the format used to encrypt the
message. (The <guilabel>Options</guilabel> menu also lets you sign / encrypt the message.)
You may choose one of five formatting options.
</para>
@@ -478,14 +478,14 @@ You may choose one of five formatting options.
<term><guilabel>Any</guilabel></term>
<listitem>
<para>&kmail; will use a format which is understood by all recipients of the
-message. The preferred format for each recipient can be specified via
+message. The preferred format for each recipient can be specified via
<ulink url="help:/kaddressbook">&kaddressbook;</ulink>.</para></listitem>
</varlistentry>
<varlistentry>
<term><guilabel>Inline OpenPGP (deprecated)</guilabel></term>
<listitem>
<para>This format is deprecated, but is supported for backward compatibility. If you use this format then only the
-message text will be signed and/or encrypted. <emphasis>Attachments will
+message text will be signed and/or encrypted. <emphasis>Attachments will
neither be signed nor encrypted.</emphasis> &HTML; messages cannot be signed
with this format. You should only use this format
when necessary, &ie; if you send messages to people who use email clients that cannot
@@ -559,7 +559,7 @@ insert anchor tags (aka links), horizontal lines, images, tables, and arbitrary
</listitem>
<listitem>
<para>Drag a file from the desktop or another folder into the
-composer window;</para>
+composer window;</para>
</listitem>
<listitem>
<para>Drag a message from &kmail;'s message list into the composer
@@ -593,8 +593,8 @@ field, it is automatically filled with an appropriate value. Sometimes the
&MIME; type may be wrong. You can then type in any &MIME; type or
choose from the list of common &MIME; types. You can also select an encoding
method for your file from the list of encoding options (normally, the default
-value works fine). Check the <guilabel>Suggest automatic display</guilabel> option
-if you want to suggest to the recipient the automatic (inline) display of this attachment.
+value works fine). Check the <guilabel>Suggest automatic display</guilabel> option
+if you want to suggest to the recipient the automatic (inline) display of this attachment.
Whether this works, or not, depends on the recipient's email client,
and on his settings.</para>
@@ -613,14 +613,14 @@ unknown words, &kmail; will disable its checking. To select the language
used when checking, select <menuchoice><guimenu>View</guimenu>
<guimenuitem>Dictionary</guimenuitem></menuchoice>. You can disable
automatic spell checking in the <menuchoice><guimenu>Options</guimenu></menuchoice> menu.</para>
-<para>If you need to write mails in different languages, enable the <guilabel>Dictionary</guilabel>
-drop down box with <menuchoice><guimenu>View</guimenu> <guimenuitem>Dictionary</guimenuitem></menuchoice>
+<para>If you need to write mails in different languages, enable the <guilabel>Dictionary</guilabel>
+drop down box with <menuchoice><guimenu>View</guimenu> <guimenuitem>Dictionary</guimenuitem></menuchoice>
from the menu. Using this drop down box allows you to change the spell checker's language with one mouse click.
</para>
<para>To check the spelling of your message via a dialog, select
<menuchoice><guimenu>Tools</guimenu>
-<guimenuitem>Spelling...</guimenuitem></menuchoice>. &kmail; uses
-&sonnet; to check spelling; &sonnet; is the &kde; frontend to the
+<guimenuitem>Spelling...</guimenuitem></menuchoice>. &kmail; uses
+&sonnet; to check spelling; &sonnet; is the &kde; frontend to the
<application>Aspell</application>, <application>Hspell</application>,
<application>Enchant</application>, and <application>HUNSPELL</application> spell
checking programs. Note that you may need to configure the spell checker using
@@ -632,12 +632,12 @@ checking programs. Note that you may need to configure the spell checker using
<sect2 id="setup-text-snippets">
<title>Setting Up the Text Snippets Tool</title>
<para>
-When editing in the composer window you can insert frequently used bits of text as snippets. To configure mail snippets, select <menuchoice>
+When editing in the composer window you can insert frequently used bits of text as snippets. To configure mail snippets, select <menuchoice>
<guimenu>View</guimenu> <guimenuitem>Snippets</guimenuitem> </menuchoice> from the menubar. A new panel will appear on the right side of the composer window.
</para>
<para>To add a new snippet to the Snippet Panel, right click on the panel, then click <menuchoice><guimenu>Add Snippet</guimenu></menuchoice>
in the context menu. A snippet editor dialog will appear, in which new text can be added and the snippet can be given a name. A
-<guilabel>Shortcut</guilabel> can also be associated with the snippet.
+<guilabel>Shortcut</guilabel> can also be associated with the snippet.
Snippets can be grouped together by creating groups and adding snippets to a particular group.
Use the &RMB; context menu to add, edit, or remove snippets of text from the saved collection.
</para>
@@ -691,7 +691,7 @@ snippetDelimiter=$
<para>Message Folders are used to organize your email messages. When you
first start &kmail; the <quote>Local Folders</quote> containing <guilabel>inbox</guilabel>,
<guilabel>outbox</guilabel>, <guilabel>sent-mail</guilabel>,
-<guilabel>trash</guilabel>, <guilabel>drafts</guilabel> and <guilabel>templates</guilabel>
+<guilabel>trash</guilabel>, <guilabel>drafts</guilabel> and <guilabel>templates</guilabel>
folders are created. Each of these folders has a special function.</para>
<variablelist>
<varlistentry>
@@ -761,8 +761,8 @@ the <guibutton>Open Search Folder</guibutton> button. A results folder will open
<para>Creating filters to automatically move messages to specified folders is a great way to organize messages by mailing list, sender, subject &etc;
Please see <link linkend="filters">Filters</link> for details.</para>
-<para>If you receive emails from a trusted source (⪚ a Blog you signed up for) that is formatted in &HTML;
-and you would like to enable &HTML; view for those emails only, you can create a new folder, set up a
+<para>If you receive emails from a trusted source (⪚ a Blog you signed up for) that is formatted in &HTML;
+and you would like to enable &HTML; view for those emails only, you can create a new folder, set up a
<link linkend="filters">filter</link> to place all email from the Blog in the new folder,
select the folder, and then choose <menuchoice><guimenu>Folder</guimenu><guimenuitem>Message Default Format ></guimenuitem>
<guimenuitem>Prefer &HTML; to Plain Text</guimenuitem></menuchoice>.</para>
@@ -860,7 +860,7 @@ bodies on demand</guilabel> if you have a slow connection. You can also set how
<sect3 id="folders-properties-templates">
<title>Templates tab</title>
-<para>On this tab you can define folder-specific templates for your custom folders.
+<para>On this tab you can define folder-specific templates for your custom folders.
For more details see the <link linkend="configure-composer-standard-templates">
Standard Templates</link> tab on the <guilabel>Composer</guilabel> page.
</para>
@@ -946,7 +946,7 @@ mailing list via <menuchoice><guimenu>Message</guimenu><guimenuitem>New
<sect3 id="folders-properties-maintainance">
<title>Maintenance tab</title>
-<para>This tab shows an overview about the folder type and its size,
+<para>This tab shows an overview about the folder type and its size,
the number of read and unread messages in the folder and allows you to enable
text indexing.</para>
</sect3>
@@ -1181,12 +1181,12 @@ linkend="filter-dialog">advanced filter dialog</link>) to those messages.</para>
to use <menuchoice><guimenu>Message</guimenu><guimenuitem>Create
Filter</guimenuitem></menuchoice> and select a criterion from the submenu. This will open the filter dialog
and present you with a new filter which has the first rule of the
-search pattern and the first action (as <guilabel>Move into Folder</guilabel>)
+search pattern and the first action (as <guilabel>Move into Folder</guilabel>)
preset. In most cases, all you have to do is select the folder where the message
should be moved, but you can, of course, edit the filter as you
like.</para>
-<para>When creating a filter on mailing list messages, this method
+<para>When creating a filter on mailing list messages, this method
will try to find a criterion that
uniquely identifies messages from the list. If it succeeds, the guessed
name of the list is presented in the
@@ -1196,7 +1196,7 @@ Mailing-List...</guimenuitem></menuchoice> menu entry.</para>
<para>The second method is to manually construct a filter from scratch
by calling the filter dialog through
-<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
+<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
Filters...</guimenuitem></menuchoice>. The filter dialog is described in
detail in the following subsection.</para>
<para> </para> <!-- whitespace -->
@@ -1212,16 +1212,16 @@ filters.</para>
<para>You can reach it either via
<menuchoice><guimenu>Message</guimenu><guisubmenu>Create
Filter</guisubmenu></menuchoice> or
-<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
+<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
Filters...</guimenuitem></menuchoice>.</para>
-<para>The dialog is divided into three main sections on the <guilabel>General</guilabel>
+<para>The dialog is divided into three main sections on the <guilabel>General</guilabel>
and <guilabel>Advanced</guilabel> tabs.</para>
<variablelist>
<varlistentry>
<term><guilabel>Available Filters</guilabel></term>
<listitem><para>This group contains the list of filters and some action
-buttons to modify the filters, namely: create new filters; move them up or
+buttons to modify the filters, namely: create new filters; move them up or
down the list; copy one of them; delete them; or rename them. If you select
a filter from the list, its properties are shown in the right-hand half
of the dialog.</para></listitem>
@@ -1279,9 +1279,9 @@ filtering is specifically selected (&ie; via
<menuchoice><guimenu>Message</guimenu> <guimenuitem>Apply
Filters</guimenuitem></menuchoice>.)</para>
<para>If <guilabel>Apply this filter to sent messages</guilabel> is checked
-the filter will be triggered <emphasis>after</emphasis> the message is sent and it will
-only affect the local copy of the message. If the recipient's copy
-also needs to be modified, please use <guilabel>Apply this filter before
+the filter will be triggered <emphasis>after</emphasis> the message is sent and it will
+only affect the local copy of the message. If the recipient's copy
+also needs to be modified, please use <guilabel>Apply this filter before
sending messages</guilabel>.
</para>
<para>The <guilabel>If this filter matches, stop processing here</guilabel>
@@ -1332,7 +1332,7 @@ and action lists, respectively, before the filter is saved.</para>
messages. This can be done by choosing <guilabel>From</guilabel>. A
good bet for a mailing list would be
<guilabel>All Recipients</guilabel>, but there are other criteria
-a filter can search for (note that all patterns are interpreted
+a filter can search for (note that all patterns are interpreted
case-insensitively).</para>
<variablelist>
@@ -1376,7 +1376,7 @@ if any).</para>
<varlistentry>
<term><guilabel>Message Status</guilabel></term>
<listitem>
-<para>Sets restrictions on the status of the message (Important / Read / Unread / &etc;
+<para>Sets restrictions on the status of the message (Important / Read / Unread / &etc;
see <menuchoice><guimenu>Message</guimenu><guimenuitem>Mark Message ></guimenuitem></menuchoice>).</para>
</listitem>
</varlistentry>
@@ -1440,8 +1440,8 @@ text.</entry>
<row>
<entry><guilabel>matches regular expr.</guilabel>/<guilabel>does not match reg. expr.</guilabel></entry>
<entry>all textual search items</entry>
-<entry>Matches if a part of the searched item matches the given regular
-expression (or does not match it). If the regular expression editor is
+<entry>Matches if a part of the searched item matches the given regular
+expression (or does not match it). If the regular expression editor is
installed then you can edit the regular expression by clicking on the <guilabel>Edit...</guilabel> button.</entry>
</row>
<row>
@@ -1468,7 +1468,7 @@ sense for address fields.</entry>
<row>
<entry><guilabel>is equal to</guilabel>/<guilabel>is not equal to</guilabel></entry>
<entry>numerical search items</entry>
-<entry>Matches if the value of the search item is equal to (or not equal to)
+<entry>Matches if the value of the search item is equal to (or not equal to)
the specified value.</entry>
</row>
<row>
@@ -1574,7 +1574,7 @@ receipt) to the sender of the message.</para>
<para>This will set the method of transport (⪚ &SMTP;)
that will be used when you reply to the message. You may choose from a list of all your outgoing email accounts.</para>
</listitem>
-</varlistentry>
+</varlistentry>
<varlistentry>
<term><guilabel>Set Reply-To To</guilabel></term>
<listitem><para>This will modify the <guilabel>Reply-To</guilabel> field of this
@@ -1585,7 +1585,7 @@ address you do not wish to use.</para>
<varlistentry>
<term><guilabel>Forward To</guilabel></term>
<listitem><para>This will forward the message inline (&ie; as if you selected <menuchoice><guimenu>Message</guimenu>
-<guimenuitem>Forward</guimenuitem><guimenuitem>Inline...</guimenuitem></menuchoice>) to another email address. You
+<guimenuitem>Forward</guimenuitem><guimenuitem>Inline...</guimenuitem></menuchoice>) to another email address. You
may select a custom forwarding template if such a template has been defined. If &kaddressbook; is installed, you may choose the
<quote>Forward To</quote> address from a pop-up window.</para>
</listitem>
@@ -1599,7 +1599,7 @@ choose the <quote>Redirect To</quote> address from a pop-up window.</para>
<varlistentry>
<term><guilabel>Confirm Delivery</guilabel></term>
<listitem><para>Will return a message to the sender that
-verifies successful delivery of their message, if the sender requested that.</para>
+verifies successful delivery of their message, if the sender requested that.</para>
<para>This action allows you to select who will get delivery receipts from
you. Though you can globally enable the sending of delivery
confirmations in the <guilabel>Configure &kmail;...</guilabel> dialog
@@ -1654,7 +1654,7 @@ substitutions (<symbol>%n</symbol>,
<symbol>%{foo}</symbol> as with <guilabel>Execute
Command</guilabel> may be performed on the command line.</para>
<para>Both the Anti-Spam Wizard and the Anti-Virus Wizard use the <quote>Pipe Through</quote>
-action to check for spam / malware. The commonly available anti-spam and anti-virus programs
+action to check for spam / malware. The commonly available anti-spam and anti-virus programs
return the message, and insert an extra header record, if spam (or a virus) is detected.</para>
<warning><para>Be cautious with this action, as it can damage
your messages if the filter program returns garbage or extra
@@ -1674,7 +1674,7 @@ given name from the message. This is useful mainly for removing bogus
<listitem>
<para>If no such field is already present this will add a new header field
with the given name and value to the message; if there already is a
-header field with that name, it is overwritten with the
+header field with that name, it is overwritten with the
given value; if there are already multiple headers with the given
name (⪚ <quote>Received:</quote> headers), an arbitrary one of them is
overwritten and the others are left unchanged -- this is a known
@@ -1761,9 +1761,9 @@ Filters...</guimenuitem></menuchoice> dialog and click the
list.</para>
</step>
<step>
-<para>In the <guilabel>Filter Criteria</guilabel> area, select <guilabel>Anywhere
+<para>In the <guilabel>Filter Criteria</guilabel> area, select <guilabel>Anywhere
in Headers</guilabel> and <guilabel>contains</guilabel> from the drop down boxes and type
-<userinput>Priority</userinput> in the text field. Select the same criterion
+<userinput>Priority</userinput> in the text field. Select the same criterion
in the next line and type <userinput>urgent</userinput> in the
text field of the second drop down box.</para>
<para>So your filter will match all messages containing a
@@ -1819,7 +1819,7 @@ List messages is that they always contain
quite perfect, because this fails for cross-posted messages.</para>
</step>
<step>
-<para>Select <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
+<para>Select <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
Filters...</guimenuitem></menuchoice>.</para>
</step>
<step>
@@ -1890,14 +1890,14 @@ some ideas which can help you to improve filter performance.
<varlistentry>
<term>Stop filter processing as soon as possible:</term>
<listitem>
-<para>If you know that a filter finally processes a certain class of
-messages, please make sure to check the option <guilabel>If this filter
-matches, stop processing here</guilabel> for the filter.
+<para>If you know that a filter finally processes a certain class of
+messages, please make sure to check the option <guilabel>If this filter
+matches, stop processing here</guilabel> for the filter.
This will avoid the evaluation of the filter rules of all subsequent
filters. (See the advanced options in the <link linkend="filter-dialog-id">
Filter Dialog</link>).</para>
<para>An example is filtering messages from mailing lists via List-Id
-header into separate folders. Having found out that a message came from
+header into separate folders. Having found out that a message came from
list A means that you can avoid checking the next filter for messages
from list B.
</para>
@@ -1915,7 +1915,7 @@ expr.</guilabel> operation.
</para>
<para>Another dependency is on the amount of data which is used for the
evaluation of a filter rule. If the rule is based on a message header,
-its evaluation should normally be much faster than the evaluation of
+its evaluation should normally be much faster than the evaluation of
a rule based on the complete message.
</para>
<para>Try to keep the filter rules as simple as possible.
@@ -1927,19 +1927,19 @@ a rule based on the complete message.
<varlistentry>
<term>Check the order of your filters:</term>
<listitem>
-<para>The various filter actions have different degrees of complexity.
-The most expensive filter actions are <guilabel>Pipe Through</guilabel>
-and <guilabel>Execute Command</guilabel>, because both need external
+<para>The various filter actions have different degrees of complexity.
+The most expensive filter actions are <guilabel>Pipe Through</guilabel>
+and <guilabel>Execute Command</guilabel>, because both need external
programs to be run. Placing filters containing these filter actions
behind other filters that can reduce the number of times these complex
actions are required is useful, if the filter logic allows
-this.</para>
-<para>An example is filtering messages from a mailing list and detecting
-spam messages. For the spam detection you will usually use an external
-tool via a <guilabel>Pipe Through</guilabel> action. Filtering the messages
-for the mailing list is done via the List-Id header. If you do not want to
+this.</para>
+<para>An example is filtering messages from a mailing list and detecting
+spam messages. For the spam detection you will usually use an external
+tool via a <guilabel>Pipe Through</guilabel> action. Filtering the messages
+for the mailing list is done via the List-Id header. If you do not want to
check the messages from the mailing list for spam too, it is better to
-use the filter for the mailing list messages before the filter for the
+use the filter for the mailing list messages before the filter for the
spam detection. This way you avoid the expensive and slow spam check for all
messages which were identified as mailing list messages.
</para>
@@ -1952,11 +1952,11 @@ messages which were identified as mailing list messages.
<title>Filter Log</title>
<para>If you want to verify that your filters work as intended, you can
open a viewer for the filter log via <menuchoice><guimenu>Tools</guimenu>
-<guimenuitem>Filter Log Viewer...</guimenuitem></menuchoice>.
+<guimenuitem>Filter Log Viewer...</guimenuitem></menuchoice>.
</para>
-<para>In the viewer you can configure logging of the filter
-process. You can control the level of detail recorded, clear the log, limit the size of the log,
-and save the log as a file. The log can provide valuable information when
+<para>In the viewer you can configure logging of the filter
+process. You can control the level of detail recorded, clear the log, limit the size of the log,
+and save the log as a file. The log can provide valuable information when
you want to improve your filter rules.
</para>
</sect2>
@@ -2034,7 +2034,7 @@ into your configured archive folder for easy viewing later on.
</para>
</listitem>
</varlistentry> --><!-- This feature is no longer available. @dcb2020295 -->
-</variablelist>
+</variablelist>
</sect2>
<sect2 id="exporting">
<title>Exporting</title>
@@ -2128,7 +2128,7 @@ Mail</guiicon> icon (on the toolbar) for a few seconds to get a list of accounts
<title>Signing and Encrypting Messages with <application>GnuPG</application></title>
<!--
-<note><para>There have been major changes in the way &kmail; handles
+<note><para>There have been major changes in the way &kmail; handles
signing/encryption. The following introduction applies to the previous
version of &kmail;. You can still read the introduction to get an overview
about how to sign/encrypt messages, but the details, especially those of
@@ -2152,10 +2152,10 @@ Then, you can decide for each attachment whether it should be signed/encrypted o
</para></warning>
<!-- <warning><para>&kmail; has to rely on <application>GnuPG</application>'s
-output; this output is often different between different versions of
+output; this output is often different between different versions of
<application>GnuPG</application>, so it is important that you test if encryption
really works with your setup before you start using it seriously. &kmail; might
-<emphasis>not</emphasis> warn you if something fails - enable
+<emphasis>not</emphasis> warn you if something fails - enable
<guilabel>Show signed/encrypted text
after composing</guilabel>. </para></warning> --><!-- Removing this warning ... GnuPG is stable now. @dcb2020295 -->
@@ -2163,7 +2163,7 @@ after composing</guilabel>. </para></warning> --><!-- Removing this warning ...
necessary to have <application>GnuPG</application> installed and configured
properly. Of course, we cannot give you a full introduction to
<application>GnuPG</application> here. We will only mention the steps you must perform
-to get <application>GnuPG</application> going. For details you should look at
+to get <application>GnuPG</application> going. For details you should look at
<ulink url="https://www.gnupg.org/docs.html#guides">The &GNU; Privacy Handbook</ulink>.</para>
<para>It is certainly a good idea to study the GnuPG documentation as well as an
@@ -2179,7 +2179,7 @@ many security related issues you should know about are discussed there.</para>
just make a symlink.</para>
<para>If you have not yet done so, you must generate a key pair (secret and public
-keys) for your identity. You may do this using &kgpg; or &kleopatra; or at the command line:
+keys) for your identity. You may do this using &kgpg; or &kleopatra; or at the command line:
<userinput><command>gpg</command> <option>--gen-key</option></userinput>. Or you
can ask &kmail; to create a new key pair when you create
a new email account. The identity (normally your name followed by your email address
@@ -2223,10 +2223,10 @@ you, too.</para>
<varlistentry>
<term><guilabel>Store sent messages encrypted</guilabel></term>
<listitem>
-<para>When this box is checked, sent messages are stored encrypted, as they were
-sent. This is not recommended, as you will not be able to read the messages
+<para>When this box is checked, sent messages are stored encrypted, as they were
+sent. This is not recommended, as you will not be able to read the messages
any longer if a necessary certificate expires. (Notice that GPG keys do
-not expire, as a general rule; this caution is primarily relevant for x.509 certificate users.)</para>
+not expire, as a general rule; this caution is primarily relevant for x.509 certificate users.)</para>
</listitem>
</varlistentry>
@@ -2237,7 +2237,7 @@ not expire, as a general rule; this caution is primarily relevant for x.509 cert
each recipient when you are sending an encrypted message. If this
option is off, &kmail; will show the dialog only when it cannot
find a key for a recipient or when there are conflicting or unset encryption
-preferences.</para>
+preferences.</para>
</listitem>
</varlistentry>
@@ -2283,10 +2283,10 @@ icon on the toolbar of the composer window, or select <menuchoice>
<guimenu>Options</guimenu><guimenuitem><inlinemediaobject><imageobject>
<imagedata fileref="document-edit.png" format="PNG"/></imageobject>
</inlinemediaobject> Sign Message</guimenuitem></menuchoice>. Then, you can send
-the message. The identity you are using to write the current message needs to
+the message. The identity you are using to write the current message needs to
be connected to an <guilabel>OpenPGP Key</guilabel> in the <guilabel>Identity</guilabel>
section of the <guilabel>Configure</guilabel> dialog.
-To sign the message, &kmail; needs to know your <application>GnuPG</application>
+To sign the message, &kmail; needs to know your <application>GnuPG</application>
passphrase. You may be asked to supply it, or,
if you have previously given the phrase to &kmail;, the
message will be signed automatically.</para>
@@ -2300,7 +2300,7 @@ message will be signed automatically.</para>
public key is on your gpg key ring, simply create the message in the composer window.
Before you send the message, check the <guibutton><inlinemediaobject><imageobject>
<imagedata fileref="document-decrypt.png" format="PNG"/>
-</imageobject></inlinemediaobject> Encrypt</guibutton>
+</imageobject></inlinemediaobject> Encrypt</guibutton>
button in the toolbar of the composer window (or select <menuchoice>
<guimenu>Options</guimenu><guimenuitem><inlinemediaobject><imageobject>
<imagedata fileref="document-decrypt.png" format="PNG"/>
@@ -2323,16 +2323,16 @@ Encryption Preferences, or if <guilabel>Always
show the encryption keys for approval</guilabel> is selected in the
<guilabel>Security</guilabel> section of &kmail;'s configuration dialog,
the <guilabel>Encryption Key Approval</guilabel> dialog will appear.
-You can select different keys for the recipients and can
+You can select different keys for the recipients and can
set the <guilabel>Encryption Preference</guilabel> for each recipient.
The option, <guilabel>Encrypt whenever encryption is
possible</guilabel> (on the <guilabel>Cryptography</guilabel> tab of the
<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem>
-</menuchoice> dialog), will automatically encrypt your message if there is a
+</menuchoice> dialog), will automatically encrypt your message if there is a
trusted key for each recipient.</para>
<para>As mentioned above, you will not be able to read your own encrypted sent
-messages if you do not check <guilabel>When encrypting emails, always also encrypt
+messages if you do not check <guilabel>When encrypting emails, always also encrypt
to the certificate of my own identity</guilabel> in the
settings' <guilabel>Security</guilabel> page.</para>
@@ -2377,7 +2377,7 @@ Before you use this key to encrypt a message to the owner of the
key, you should verify the key (check its fingerprint or look for
trusted signatures); then, you can add this key to your public keyring
by typing <userinput><command>gpg</command> <option>--import</option>
-<replaceable>filename</replaceable></userinput> at the command line.
+<replaceable>filename</replaceable></userinput> at the command line.
If the key is not certified with another signature that you have already trusted,
you cannot use it to encrypt messages unless you sign (certify) the key with your own key.
</para>
@@ -2392,9 +2392,9 @@ you cannot use it to encrypt messages unless you sign (certify) the key with you
<sect2 id="spam-wizard-basics">
<title>Basics</title>
-<para>&kmail; does not have a built-in spam detection solution: the developers believe
-using external, but specialized, tools is the better approach. &kmail; uses these tools
-through its flexible filter architecture. The Anti-Spam Wizard helps you with the
+<para>&kmail; does not have a built-in spam detection solution: the developers believe
+using external, but specialized, tools is the better approach. &kmail; uses these tools
+through its flexible filter architecture. The Anti-Spam Wizard helps you with the
initial filter setup.
</para>
@@ -2402,7 +2402,7 @@ initial filter setup.
<varlistentry>
<term>What can the wizard do to help you?</term>
<listitem>
-<para>It will give you some choices about how you want the spam filtering to be set up.
+<para>It will give you some choices about how you want the spam filtering to be set up.
Afterwards it will automatically create the appropriate filter rules.
</para>
</listitem>
@@ -2410,7 +2410,7 @@ Afterwards it will automatically create the appropriate filter rules.
<varlistentry>
<term>What are the limitations of the wizard?</term>
<listitem>
-<para>All it can do is set up the filters for you; it will provide a
+<para>All it can do is set up the filters for you; it will provide a
standard setup. Manual modifications that have been applied to existing anti-spam filters are not recognized.
Instead, such filters are overwritten by the wizard.
</para>
@@ -2425,14 +2425,14 @@ available, click <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure
check the box next to <guilabel>Antispam</guilabel>. You will be prompted to
restart &kmail;; when you do, the wizard will appear on the <guilabel>Tools</guilabel> menu.</para>
-<para>The wizard scans for known anti-spam tools on your computer.
+<para>The wizard scans for known anti-spam tools on your computer.
It is also possible to use the results of spam checks made by your service provider,
by evaluating header information which has been added to the messages.
You can let the wizard prepare &kmail; to use one or more of these in parallel.
However, note that anti-spam tool operations are unusually time consuming.
&kmail; can appear to be frozen during the scan of messages for spam, so
-you may encounter problems with the responsiveness of &kmail;. Please consider
-deleting the filter rules created by the wizard if the filtering becomes
+you may encounter problems with the responsiveness of &kmail;. Please consider
+deleting the filter rules created by the wizard if the filtering becomes
too slow for you. (This has been a problem with older hardware. It probably won't afflict more modern machines.)</para>
<para>Here are some observations about a few anti-spam tools.</para>
@@ -2441,8 +2441,8 @@ too slow for you. (This has been a problem with older hardware. It probably won'
<term>Bogofilter</term>
<listitem>
<para>Bogofilter is a Bayesian filter. Its spam detection ability
-relies on an initial training phase. On the other hand, it's a pretty
-fast tool. That's why it is recommended for people who
+relies on an initial training phase. On the other hand, it's a pretty
+fast tool. That's why it is recommended for people who
want fast spam detection, and who aren't worried
about putting some effort into the initial training, before the detection rate
increases significantly.
@@ -2455,7 +2455,7 @@ increases significantly.
<para>SpamAssassin is a fairly complex tool to use against spam.
Although its behavior depends heavily on its configuration,
it can detect spam quite well without any training. However,
-scanning a message takes a little longer compared to pure Bayesian
+scanning a message takes a little longer compared to pure Bayesian
filters. Let's say it's not the tool of choice for people without
some background information about SpamAssassin's capabilities.
</para>
@@ -2489,22 +2489,22 @@ have already been processed by the external email server.
<sect2 id="spam-wizard-advanced">
<title>Advanced</title>
-<para>&kmail; can use several
-external tools to detect spam messages; it will try to automatically find
+<para>&kmail; can use several
+external tools to detect spam messages; it will try to automatically find
out which tools are installed on your system, and will display all of these
in a list. The list is ordered by the average speed of the filtering
-process of the tools. You can mark the tools which you want
-&kmail; to utilize to detect spam. If you want more choices, you
+process of the tools. You can mark the tools which you want
+&kmail; to utilize to detect spam. If you want more choices, you
can simply close the wizard, install a new tool, then restart the wizard.
</para>
<para>If you have marked at least one tool, &kmail; is able to provide filters
-which allow the classification of the messages as spam or not spam. It will
-also provide actions to let you manually classify messages. These actions will
+which allow the classification of the messages as spam or not spam. It will
+also provide actions to let you manually classify messages. These actions will
be available in the <menuchoice><guimenu>Message</guimenu><guisubmenu>Apply
Filter ></guisubmenu></menuchoice> menu item, and also via a pair of icons on the toolbar.
-If any of the tools you selected support Bayesian filtering (&ie; a method
-to detect spam based on statistical analysis of the messages) then these
+If any of the tools you selected support Bayesian filtering (&ie; a method
+to detect spam based on statistical analysis of the messages) then these
messages are not only marked but additionally piped through the tools to
help them learn, thereby improving their detection rate.
</para>
@@ -2512,8 +2512,8 @@ help them learn, thereby improving their detection rate.
<para>On the second page, you will be able to select some additional
actions to be performed in &kmail; with regard to spam messages: if you
want messages detected as spam to be moved into a certain folder, select
-the appropriate folder and mark the <guilabel>Move known spam to:</guilabel>
-option; if messages detected as spam should additionally be marked as read,
+the appropriate folder and mark the <guilabel>Move known spam to:</guilabel>
+option; if messages detected as spam should additionally be marked as read,
then mark the <guilabel>Mark detected spam messages as read</guilabel> option.
</para>
@@ -2522,9 +2522,9 @@ the wizard to finish the filter setup. The wizard will not take any
modifications in existing filters, formerly created by it, into
consideration, but will either append new filters or replace existing filters.
In any case you may want to inspect the result of this process in the
-<link linkend="filter-dialog">Filter Dialog</link>.
+<link linkend="filter-dialog">Filter Dialog</link>.
The wizard will also create toolbar buttons for marking messages as spam or
-as ham. Keep in mind that classifying messages as spam will also move those
+as ham. Keep in mind that classifying messages as spam will also move those
messages to the folder you have specified for spam messages, when you
select the <quote>spam</quote> option.
</para>
@@ -2534,20 +2534,20 @@ select the <quote>spam</quote> option.
<sect2 id="spam-wizard-details">
<title>Some More Details for Experts</title>
-<para>The wizard uses information stored in a special configuration file named
+<para>The wizard uses information stored in a special configuration file named
<filename>kmail.antispamrc</filename> (stored in the global or local &kde;
-config directory). It will first check the global config file and then the local
-config file. If the local config file contains an entry with a higher (newer)
+config directory). It will first check the global config file and then the local
+config file. If the local config file contains an entry with a higher (newer)
version number, the configuration data from the local file (for that
tool) is used, so both administrators and users can update the
wizard's configuration.
</para>
-<para>The local detection of spam messages is achieved by creating
-<guilabel>pipe through</guilabel> actions per-tool within a
-special filter. Another filter contains rules to check for detected spam
-messages and actions to mark them and (optionally, depending on the choice
-in the wizard) to move them into a folder. Both filters are configured to
+<para>The local detection of spam messages is achieved by creating
+<guilabel>pipe through</guilabel> actions per-tool within a
+special filter. Another filter contains rules to check for detected spam
+messages and actions to mark them and (optionally, depending on the choice
+in the wizard) to move them into a folder. Both filters are configured to
be applied to incoming messages and for manual filtering.
</para>
@@ -2560,7 +2560,7 @@ the messages to the tools (via <guilabel>Execute Command</guilabel> actions)
in the appropriate learning mode.
</para>
-<para>If you want to fine-tune the filtering process, you might be interested in the
+<para>If you want to fine-tune the filtering process, you might be interested in the
chapter about <link linkend="filter-optimization">Filter Optimization</link>.</para>
</sect2>
@@ -2573,9 +2573,9 @@ chapter about <link linkend="filter-optimization">Filter Optimization</link>.</p
<sect2 id="virus-wizard-basics">
<title>Basics</title>
-<para>&kmail; does not have a built-in virus detection solution: the developers believe
-using external, but specialized, tools is the better approach. &kmail; uses these tools
-through its flexible filter architecture. The Anti-Virus Wizard helps you with the
+<para>&kmail; does not have a built-in virus detection solution: the developers believe
+using external, but specialized, tools is the better approach. &kmail; uses these tools
+through its flexible filter architecture. The Anti-Virus Wizard helps you with the
initial filter setup.
</para>
@@ -2583,7 +2583,7 @@ initial filter setup.
<varlistentry>
<term>What can the wizard do to help you?</term>
<listitem>
-<para>It will give you some choices about how you want virus filtering to be set up.
+<para>It will give you some choices about how you want virus filtering to be set up.
Afterwards it will automatically create the appropriate filter rules.
</para>
</listitem>
@@ -2591,7 +2591,7 @@ Afterwards it will automatically create the appropriate filter rules.
<varlistentry>
<term>What are the limitations of the wizard?</term>
<listitem>
-<para>All it can do is set up the filters for you; it will provide a
+<para>All it can do is set up the filters for you; it will provide a
standard setup. Manual modifications that have been applied to existing anti-virus filters are not recognized.
Instead, such filters are overwritten by the wizard.
</para>
@@ -2613,20 +2613,20 @@ restart &kmail;; when you do, the wizard will appear on the <guilabel>Tools</gui
<para>The Anti-Virus Wizard basically works the same way as the
<link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link> does.
-&kmail; can use several
-external tools to detect messages containing viruses. It will determine
+&kmail; can use several
+external tools to detect messages containing viruses. It will determine
which of these tools are installed on your system, and will show you the
results from the search. You can mark the tools which you want
-&kmail; to use for virus detection. If you want more choices, you
+&kmail; to use for virus detection. If you want more choices, you
can simply close the wizard, install a new tool, then restart the wizard.
</para>
<para>If you have chosen at least one tool you will be able to select actions
for &kmail; to perform on messages containing viruses. To let &kmail; detect
messages containing viruses, you should mark the <guilabel>Check messages using the
-anti-virus tools</guilabel> option. If you want messages infected by a
+anti-virus tools</guilabel> option. If you want messages infected by a
virus to be moved into a certain folder, select the appropriate folder and
-mark the <guilabel>Move detected viral messages to the selected folder</guilabel>
+mark the <guilabel>Move detected viral messages to the selected folder</guilabel>
option. If such messages should also be marked as read,
select the <guilabel>Additionally, mark detected viral messages as read</guilabel> option.
</para>
@@ -2634,7 +2634,7 @@ select the <guilabel>Additionally, mark detected viral messages as read</guilabe
<para>Selecting at least one of these options will allow
the wizard to finish the filter setup. The wizard will not take any existing
filter rules into account, but will append new rules. In any case you
-may want to inspect the result of this process in the
+may want to inspect the result of this process in the
<link linkend="filter-dialog">Filter Dialog</link>.
</para>
@@ -2643,19 +2643,19 @@ may want to inspect the result of this process in the
<sect2 id="virus-wizard-details">
<title>Details</title>
-<para>The wizard uses information stored in a special configuration file named
+<para>The wizard uses information stored in a special configuration file named
<filename>kmail.antivirusrc</filename> (stored in the global or local &kde;
-config directory). If the local config file contains an entry with a higher (newer)
+config directory). If the local config file contains an entry with a higher (newer)
version number, the configuration data from the local file (for that
tool) is used, so both administrators and users can update the
wizard's configuration.
</para>
-<para>The detection of messages containing viruses is achieved by creating
-<guilabel>pipe through</guilabel> actions per-tool within a
-special filter. Another filter contains rules to check for infected
-messages, and actions to mark them and (optionally, depending on the choice
-in the wizard) to move them into a folder. Both filters are configured to
+<para>The detection of messages containing viruses is achieved by creating
+<guilabel>pipe through</guilabel> actions per-tool within a
+special filter. Another filter contains rules to check for infected
+messages, and actions to mark them and (optionally, depending on the choice
+in the wizard) to move them into a folder. Both filters are configured to
be applied to incoming messages and for manual filtering.
</para>
diff --git a/kmail-refresh-settings/CMakeLists.txt b/kmail-refresh-settings/CMakeLists.txt
index acc62156ab..13649ba89e 100644
--- a/kmail-refresh-settings/CMakeLists.txt
+++ b/kmail-refresh-settings/CMakeLists.txt
@@ -1,16 +1,18 @@
# SPDX-FileCopyrightText: 2019-2025 Laurent Montel <montel at kde.org>
# SPDX-License-Identifier: BSD-3-Clause
add_executable(kmail-refresh-settings)
-target_sources(kmail-refresh-settings PRIVATE
- main.cpp
- refreshsettingsassistant.cpp
- refreshsettringsfinishpage.cpp
- refreshsettingscleanuppage.cpp
- refreshsettingsfirstpage.cpp
- refreshsettingsassistant.h
- refreshsettringsfinishpage.h
- refreshsettingscleanuppage.h
- refreshsettingsfirstpage.h
+target_sources(
+ kmail-refresh-settings
+ PRIVATE
+ main.cpp
+ refreshsettingsassistant.cpp
+ refreshsettringsfinishpage.cpp
+ refreshsettingscleanuppage.cpp
+ refreshsettingsfirstpage.cpp
+ refreshsettingsassistant.h
+ refreshsettringsfinishpage.h
+ refreshsettingscleanuppage.h
+ refreshsettingsfirstpage.h
)
ecm_qt_declare_logging_category(kmail-refresh-settings HEADER kmail-refresh-settings_debug.h IDENTIFIER KMAIL_REFRESH_SETTINGS_LOG CATEGORY_NAME org.kde.pim.kmail_refresh_settings
@@ -18,13 +20,20 @@ ecm_qt_declare_logging_category(kmail-refresh-settings HEADER kmail-refresh-sett
EXPORT KMAIL
)
-
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(kmail-refresh-settings PROPERTIES UNITY_BUILD ON)
endif()
-target_link_libraries(kmail-refresh-settings KF6::I18n KPim6::AkonadiWidgets KF6::DBusAddons KF6::Crash KF6::XmlGui)
-
-
-install(TARGETS kmail-refresh-settings ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(PROGRAMS org.kde.kmail-refresh-settings.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+target_link_libraries(
+ kmail-refresh-settings
+ KF6::I18n
+ KPim6::AkonadiWidgets
+ KF6::DBusAddons
+ KF6::Crash
+ KF6::XmlGui
+)
+install(TARGETS kmail-refresh-settings ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(
+ PROGRAMS org.kde.kmail-refresh-settings.desktop
+ DESTINATION ${KDE_INSTALL_APPDIR}
+)
diff --git a/ktnef/CMakeLists.txt b/ktnef/CMakeLists.txt
index 6063cf1ca2..d160dd91f4 100644
--- a/ktnef/CMakeLists.txt
+++ b/ktnef/CMakeLists.txt
@@ -3,7 +3,10 @@
include(TestBigEndian)
test_big_endian(CMAKE_WORDS_BIGENDIAN)
-configure_file(src/config-ktnef.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/config-ktnef.h)
+configure_file(
+ src/config-ktnef.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/src/config-ktnef.h
+)
add_subdirectory(src)
diff --git a/ktnef/doc/index.docbook b/ktnef/doc/index.docbook
index 1412f70b2a..e620b06b5c 100644
--- a/ktnef/doc/index.docbook
+++ b/ktnef/doc/index.docbook
@@ -52,7 +52,7 @@
<para>The TNEF File Viewer allows to handle easily mail attachments using the TNEF format. Those attachments
are usually found in mails coming from <trademark class="registered">Microsoft</trademark>
mail servers and embed the mail properties as well as the actual attachments.</para>
- <para>An attachment in TNEF format is most often named <filename>winmail.dat</filename>
+ <para>An attachment in TNEF format is most often named <filename>winmail.dat</filename>
or <filename>win.dat</filename>.</para>
<screenshot>
<screeninfo>TNEF Main Window</screeninfo>
diff --git a/ktnef/src/CMakeLists.txt b/ktnef/src/CMakeLists.txt
index 29a6cd539f..a811ec50ff 100644
--- a/ktnef/src/CMakeLists.txt
+++ b/ktnef/src/CMakeLists.txt
@@ -1,24 +1,30 @@
# SPDX-FileCopyrightText: none
# SPDX-License-Identifier: BSD-3-Clause
-configure_file(ktnef-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/ktnef-version.h @ONLY)
+configure_file(
+ ktnef-version.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/ktnef-version.h
+ @ONLY
+)
add_subdirectory(pics)
add_executable(ktnef)
-target_sources(ktnef PRIVATE
- main.cpp
- attachpropertydialog.cpp
- ktnefmain.cpp
- ktnefview.cpp
- messagepropertydialog.cpp
- qwmf.cpp
- attachpropertydialog.h
- ktnefmain.h
- ktnefview.h
- messagepropertydialog.h
- qwmf.h
- ktnef.qrc
+target_sources(
+ ktnef
+ PRIVATE
+ main.cpp
+ attachpropertydialog.cpp
+ ktnefmain.cpp
+ ktnefview.cpp
+ messagepropertydialog.cpp
+ qwmf.cpp
+ attachpropertydialog.h
+ ktnefmain.h
+ ktnefview.h
+ messagepropertydialog.h
+ qwmf.h
+ ktnef.qrc
)
ecm_qt_declare_logging_category(ktnef HEADER ktnef_debug.h IDENTIFIER KTNEFAPPS_LOG CATEGORY_NAME org.kde.pim.ktnefapps
@@ -26,8 +32,10 @@ ecm_qt_declare_logging_category(ktnef HEADER ktnef_debug.h IDENTIFIER KTNEFAPPS_
EXPORT KMAIL
)
-
-file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hicolor/*-apps-ktnef.png")
+file(
+ GLOB ICONS_SRCS
+ "${CMAKE_CURRENT_SOURCE_DIR}/pics/hicolor/*-apps-ktnef.png"
+)
ecm_add_app_icon(ktnef ICONS ${ICONS_SRCS})
ki18n_wrap_ui(ktnef ui/attachpropertywidgetbase.ui)
@@ -36,7 +44,8 @@ if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(ktnef PROPERTIES UNITY_BUILD ON)
endif()
-target_link_libraries(ktnef
+target_link_libraries(
+ ktnef
Qt::Widgets
KPim6::Tnef
KF6::DBusAddons
@@ -48,8 +57,6 @@ target_link_libraries(ktnef
KF6::KIOWidgets
)
-
install(TARGETS ktnef ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS org.kde.ktnef.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-
diff --git a/ktnef/src/ktnef.qrc b/ktnef/src/ktnef.qrc
index c0d55d06cb..a149754d39 100644
--- a/ktnef/src/ktnef.qrc
+++ b/ktnef/src/ktnef.qrc
@@ -4,4 +4,3 @@
<file>ktnefui.rc</file>
</qresource>
</RCC>
-
diff --git a/readme-build-ftime.txt b/readme-build-ftime.txt
index 833cfa009c..b931a1804d 100644
--- a/readme-build-ftime.txt
+++ b/readme-build-ftime.txt
@@ -23,4 +23,3 @@ ClangBuildAnalyzer --analyze build-ftime.txt > analyze-build-ftime.txt
see https://aras-p.info/blog/2019/09/28/Clang-Build-Analyzer/
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d2e29f696..01d70c5ad8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,10 +5,13 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kmail\")
qt_generate_dbus_interface(kmkernel.h org.kde.kmail.kmail.xml OPTIONS -a)
qt_generate_dbus_interface(editor/kmcomposerwin.h org.kde.kmail.mailcomposer.xml OPTIONS -a)
-add_custom_target(kmail_xml ALL
+add_custom_target(
+ kmail_xml
+ ALL
DEPENDS ${kmail_BINARY_DIR}/src/org.kde.kmail.kmail.xml
DEPENDS ${kmail_BINARY_DIR}/src/org.kde.kmail.mailcomposer.xml
- COMMENT "Helper target for XML stuff. The Kontact plugin, KOrganizer and others depend on it."
+ COMMENT
+ "Helper target for XML stuff. The Kontact plugin, KOrganizer and others depend on it."
)
add_subdirectory(pics)
@@ -17,9 +20,6 @@ add_subdirectory(kontactplugin)
########### kmailprivate ###############
-
-
-
set(kmail_debugcategory_SRCS)
ecm_qt_declare_logging_category(kmail_debugcategory_SRCS HEADER kmail_debug.h IDENTIFIER KMAIL_LOG CATEGORY_NAME org.kde.pim.kmail
DESCRIPTION "kmail (kmail)"
@@ -38,336 +38,331 @@ ecm_qt_declare_logging_category(kmail_debugcategory_SRCS HEADER kmail_activities
EXPORT KMAIL
)
-
add_library(kmailprivate)
if(TARGET KF6::UserFeedbackWidgets)
- target_sources(kmailprivate PRIVATE
- userfeedback/accountinfosource.cpp
- userfeedback/accountinfosource.h
- userfeedback/plugininfosource.cpp
- userfeedback/plugininfosource.h
- userfeedback/kmailuserfeedbackprovider.cpp
- userfeedback/kmailuserfeedbackprovider.h
-)
+ target_sources(
+ kmailprivate
+ PRIVATE
+ userfeedback/accountinfosource.cpp
+ userfeedback/accountinfosource.h
+ userfeedback/plugininfosource.cpp
+ userfeedback/plugininfosource.h
+ userfeedback/kmailuserfeedbackprovider.cpp
+ userfeedback/kmailuserfeedbackprovider.h
+ )
endif()
-target_sources(kmailprivate PRIVATE
- ${kmail_debugcategory_SRCS}
- attributes/taskattribute.cpp
- folderarchive/folderarchiveaccountinfo.cpp
- folderarchive/folderarchiveutil.cpp
- folderarchive/folderarchivecache.cpp
- folderarchive/folderarchiveagentcheckcollection.cpp
- folderarchive/folderarchivemanager.cpp
- folderarchive/folderarchiveagentjob.cpp
- collectionpage/collectiontemplatespage.cpp
- collectionpage/collectionviewpage.cpp
- collectionpage/collectionquotapage.cpp
- collectionpage/collectionquotawidget.cpp
- collectionpage/collectionmailinglistpage.cpp
- collectionpage/collectionshortcutpage.cpp
- configuredialog/configagentdelegate.cpp
- configuredialog/configuredialoglistview.cpp
- configuredialog/configuredialog.cpp
- configuredialog/configuredialog_p.cpp
- configuredialog/configuremiscpage.cpp
- configuredialog/configuresecuritypage.cpp
- configuredialog/configurecomposerpage.cpp
- configuredialog/configureappearancepage.cpp
- configuredialog/configureaccountpage.cpp
- configuredialog/configurepluginpage.cpp
- configuredialog/colorlistbox.cpp
- configuredialog/configureplugins/configurepluginslistwidget.cpp
- searchdialog/kmsearchmessagemodel.cpp
- searchdialog/searchpatternwarning.cpp
- searchdialog/kmailsearchpatternedit.cpp
- searchdialog/searchwindowdialog.cpp
- searchdialog/searchdescriptionattribute.cpp
- searchdialog/incompleteindexdialog.cpp
- identity/identitydialog.cpp
- identity/xfaceconfigurator.cpp
- identity/encodedimagepicker.cpp
- identity/newidentitydialog.cpp
- identity/identityeditvcarddialog.cpp
- identity/identityaddvcarddialog.cpp
- identity/identityinvalidfolder.cpp
- identity/identityfolderrequester.cpp
-
- identity/identitytreengwidget.h
- identity/identitytreengwidget.cpp
- identity/identityngpage.cpp
- identity/identityngpage.h
- identity/identityexpirespamfolderdialog.h
- identity/identityexpirespamfolderdialog.cpp
-
- editor/kmcomposereditorng.cpp
- editor/encryptionstate.cpp
- editor/subjectlineeditwithautocorrection.cpp
- editor/subjectlineeditwithautocorrection.h
- editor/composer.cpp
- editor/kmcomposerwin.cpp
- editor/attachment/attachmentcontroller.cpp
- editor/attachment/attachmentview.cpp
- editor/widgets/cryptostateindicatorwidget.cpp
- editor/validatesendmailshortcut.cpp
- editor/kmcomposerglobalaction.cpp
- editor/kmcomposerupdatetemplatejob.cpp
- editor/kmcomposercreatenewcomposerjob.cpp
- editor/pimmessagebox.cpp
- editor/warningwidgets/externaleditorwarning.cpp
- editor/warningwidgets/attachmentmissingwarning.cpp
- editor/warningwidgets/incorrectidentityfolderwarning.cpp
- editor/warningwidgets/attachmentaddedfromexternalwarning.cpp
- editor/warningwidgets/toomanyrecipientswarning.cpp
- editor/warningwidgets/nearexpirywarning.cpp
- editor/potentialphishingemail/potentialphishingemailwarning.cpp
- editor/potentialphishingemail/potentialphishingemailjob.cpp
- editor/potentialphishingemail/potentialphishingdetaildialog.cpp
- editor/potentialphishingemail/potentialphishingdetailwidget.cpp
- dialog/archivefolderdialog.cpp
- dialog/addemailtoexistingcontactdialog.cpp
- dialog/kmknotify.cpp
- dialog/spellcheckerconfigdialog.cpp
- job/addressvalidationjob.cpp
- job/createnewcontactjob.cpp
- job/addemailtoexistingcontactjob.cpp
- job/createtaskjob.cpp
- job/savedraftjob.cpp
- job/removeduplicatemailjob.cpp
- job/createfollowupreminderonexistingmessagejob.cpp
- job/removecollectionjob.cpp
- job/saveasfilejob.cpp
- job/markallmessagesasreadinfolderandsubfolderjob.cpp
- job/removeduplicatemessageinfolderandsubfolderjob.cpp
- job/handleclickedurljob.cpp
- job/composenewmessagejob.cpp
- job/opencomposerjob.cpp
- job/newmessagejob.cpp
- job/opencomposerhiddenjob.cpp
- job/fillcomposerjob.cpp
- job/createreplymessagejob.cpp
- job/createforwardmessagejob.cpp
- job/dndfromarkjob.cpp
- job/clearcachejobinfolderandsubfolderjob.cpp
- job/clearcachejobinfolderandsubfolderjob.h
- widgets/collectionpane.cpp
- widgets/vacationscriptindicatorwidget.cpp
- widgets/displaymessageformatactionmenu.cpp
- widgets/kactionmenutransport.cpp
- widgets/kactionmenuaccount.cpp
- widgets/zoomlabelwidget.cpp
- tag/tagactionmanager.cpp
- tag/tagselectdialog.cpp
- tag/tagmonitormanager.cpp
- plugininterface/kmailplugininterface.cpp
- plugininterface/kmailplugincheckbeforedeletingmanagerinterface.cpp
- editor/plugininterface/kmailplugineditormanagerinterface.cpp
- editor/plugininterface/kmailplugineditorcheckbeforesendmanagerinterface.cpp
- editor/plugininterface/kmailplugineditorinitmanagerinterface.cpp
- editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp
- editor/plugininterface/kmailplugingrammareditormanagerinterface.cpp
-
- sieveimapinterface/kmailsieveimapinstanceinterface.cpp
- sieveimapinterface/kmsieveimappasswordprovider.cpp
- undosend/undosendcombobox.cpp
- undosend/undosendmanager.cpp
- undosend/undosendcreatejob.cpp
- kmmainwin.cpp
- settings/kmailsettings.cpp
- kmreaderwin.cpp
- kmsystemtray.cpp
- unityservicemanager.cpp
- undostack.cpp
- kmkernel.cpp
- commandlineinfo.h
- commandlineinfo.cpp
- kmcommands.cpp
- kmreadermainwin.cpp
- kmmainwidget.cpp
- aboutdata.cpp
- mailserviceimpl.cpp
- secondarywindow.cpp
- util.cpp
- kmail_options.h
- messageactions.cpp
- foldershortcutactionmanager.cpp
- kmlaunchexternalcomponent.cpp
- manageshowcollectionproperties.cpp
- kmail.qrc
-
- attributes/taskattribute.h
- folderarchive/folderarchiveaccountinfo.h
- folderarchive/folderarchiveutil.h
- folderarchive/folderarchivecache.h
- folderarchive/folderarchiveagentcheckcollection.h
- folderarchive/folderarchivemanager.h
- folderarchive/folderarchiveagentjob.h
- collectionpage/collectiontemplatespage.h
- collectionpage/collectionviewpage.h
- collectionpage/collectionquotapage.h
- collectionpage/collectionquotawidget.h
- collectionpage/collectionmailinglistpage.h
- collectionpage/collectionshortcutpage.h
- configuredialog/configagentdelegate.h
- configuredialog/configuredialoglistview.h
- configuredialog/configuredialog.h
- configuredialog/configuredialog_p.h
- configuredialog/configuremiscpage.h
- configuredialog/configuresecuritypage.h
- configuredialog/configurecomposerpage.h
- configuredialog/configureappearancepage.h
- configuredialog/configureaccountpage.h
- configuredialog/configurepluginpage.h
- configuredialog/colorlistbox.h
- configuredialog/configureplugins/configurepluginslistwidget.h
- searchdialog/kmsearchmessagemodel.h
- searchdialog/searchpatternwarning.h
- searchdialog/kmailsearchpatternedit.h
- searchdialog/searchwindowdialog.h
- searchdialog/searchdescriptionattribute.h
- searchdialog/incompleteindexdialog.h
- identity/identitydialog.h
- identity/xfaceconfigurator.h
- identity/encodedimagepicker.h
- identity/newidentitydialog.h
- identity/identityeditvcarddialog.h
- identity/identityaddvcarddialog.h
- identity/identityinvalidfolder.h
- identity/identityfolderrequester.h
-
- editor/kmcomposereditorng.h
- editor/composer.h
- editor/encryptionstate.h
- editor/kmcomposerwin.h
- editor/attachment/attachmentcontroller.h
- editor/attachment/attachmentview.h
- editor/widgets/cryptostateindicatorwidget.h
- editor/validatesendmailshortcut.h
- editor/kmcomposerglobalaction.h
- editor/kmcomposerupdatetemplatejob.h
- editor/kmcomposercreatenewcomposerjob.h
- editor/pimmessagebox.h
- editor/warningwidgets/externaleditorwarning.h
- editor/warningwidgets/attachmentmissingwarning.h
- editor/warningwidgets/incorrectidentityfolderwarning.h
- editor/warningwidgets/attachmentaddedfromexternalwarning.h
- editor/warningwidgets/toomanyrecipientswarning.h
- editor/warningwidgets/nearexpirywarning.h
- editor/potentialphishingemail/potentialphishingemailwarning.h
- editor/potentialphishingemail/potentialphishingemailjob.h
- editor/potentialphishingemail/potentialphishingdetaildialog.h
- editor/potentialphishingemail/potentialphishingdetailwidget.h
- dialog/archivefolderdialog.h
- dialog/addemailtoexistingcontactdialog.h
- dialog/kmknotify.h
- dialog/spellcheckerconfigdialog.h
- job/addressvalidationjob.h
- job/createnewcontactjob.h
- job/addemailtoexistingcontactjob.h
- job/createtaskjob.h
- job/savedraftjob.h
- job/removeduplicatemailjob.h
- job/createfollowupreminderonexistingmessagejob.h
- job/removecollectionjob.h
- job/saveasfilejob.h
- job/markallmessagesasreadinfolderandsubfolderjob.h
- job/removeduplicatemessageinfolderandsubfolderjob.h
- job/handleclickedurljob.h
- job/composenewmessagejob.h
- job/opencomposerjob.h
- job/newmessagejob.h
- job/opencomposerhiddenjob.h
- job/fillcomposerjob.h
- job/createreplymessagejob.h
- job/createforwardmessagejob.h
- job/dndfromarkjob.h
- widgets/collectionpane.h
- widgets/vacationscriptindicatorwidget.h
- widgets/displaymessageformatactionmenu.h
- widgets/kactionmenutransport.h
- widgets/kactionmenuaccount.h
- widgets/zoomlabelwidget.h
- tag/tagactionmanager.h
- tag/tagselectdialog.h
- tag/tagmonitormanager.h
- plugininterface/kmailplugininterface.h
- plugininterface/kmailplugincheckbeforedeletingmanagerinterface.h
- editor/plugininterface/kmailplugineditormanagerinterface.h
- editor/plugininterface/kmailplugineditorcheckbeforesendmanagerinterface.h
- editor/plugininterface/kmailplugineditorinitmanagerinterface.h
- editor/plugininterface/kmailplugineditorconverttextmanagerinterface.h
- editor/plugininterface/kmailplugingrammareditormanagerinterface.h
-
- sieveimapinterface/kmailsieveimapinstanceinterface.h
- sieveimapinterface/kmsieveimappasswordprovider.h
- undosend/undosendcombobox.h
- undosend/undosendmanager.h
- undosend/undosendcreatejob.h
- kmmainwin.h
- settings/kmailsettings.h
- kmreaderwin.h
- kmsystemtray.h
- unityservicemanager.h
- undostack.h
- kmkernel.h
- kmcommands.h
- kmreadermainwin.h
- kmmainwidget.h
- aboutdata.h
- mailserviceimpl.h
- secondarywindow.h
- util.h
- messageactions.h
- foldershortcutactionmanager.h
- kmlaunchexternalcomponent.h
- manageshowcollectionproperties.h
- historyswitchfolder/collectionswitchertreeview.cpp
- historyswitchfolder/collectionswitchertreeview.h
- historyswitchfolder/collectionswitchertreeviewmanager.h
- historyswitchfolder/collectionswitchertreeviewmanager.cpp
- historyswitchfolder/collectionswitchermodel.h
- historyswitchfolder/collectionswitchermodel.cpp
-
- historyclosedreader/historyclosedreaderinfo.h
- historyclosedreader/historyclosedreaderinfo.cpp
- historyclosedreader/historyclosedreadermanager.h
- historyclosedreader/historyclosedreadermanager.cpp
- historyclosedreader/historyclosedreadermenu.h
- historyclosedreader/historyclosedreadermenu.cpp
+target_sources(
+ kmailprivate
+ PRIVATE
+ ${kmail_debugcategory_SRCS}
+ attributes/taskattribute.cpp
+ folderarchive/folderarchiveaccountinfo.cpp
+ folderarchive/folderarchiveutil.cpp
+ folderarchive/folderarchivecache.cpp
+ folderarchive/folderarchiveagentcheckcollection.cpp
+ folderarchive/folderarchivemanager.cpp
+ folderarchive/folderarchiveagentjob.cpp
+ collectionpage/collectiontemplatespage.cpp
+ collectionpage/collectionviewpage.cpp
+ collectionpage/collectionquotapage.cpp
+ collectionpage/collectionquotawidget.cpp
+ collectionpage/collectionmailinglistpage.cpp
+ collectionpage/collectionshortcutpage.cpp
+ configuredialog/configagentdelegate.cpp
+ configuredialog/configuredialoglistview.cpp
+ configuredialog/configuredialog.cpp
+ configuredialog/configuredialog_p.cpp
+ configuredialog/configuremiscpage.cpp
+ configuredialog/configuresecuritypage.cpp
+ configuredialog/configurecomposerpage.cpp
+ configuredialog/configureappearancepage.cpp
+ configuredialog/configureaccountpage.cpp
+ configuredialog/configurepluginpage.cpp
+ configuredialog/colorlistbox.cpp
+ configuredialog/configureplugins/configurepluginslistwidget.cpp
+ searchdialog/kmsearchmessagemodel.cpp
+ searchdialog/searchpatternwarning.cpp
+ searchdialog/kmailsearchpatternedit.cpp
+ searchdialog/searchwindowdialog.cpp
+ searchdialog/searchdescriptionattribute.cpp
+ searchdialog/incompleteindexdialog.cpp
+ identity/identitydialog.cpp
+ identity/xfaceconfigurator.cpp
+ identity/encodedimagepicker.cpp
+ identity/newidentitydialog.cpp
+ identity/identityeditvcarddialog.cpp
+ identity/identityaddvcarddialog.cpp
+ identity/identityinvalidfolder.cpp
+ identity/identityfolderrequester.cpp
+ identity/identitytreengwidget.h
+ identity/identitytreengwidget.cpp
+ identity/identityngpage.cpp
+ identity/identityngpage.h
+ identity/identityexpirespamfolderdialog.h
+ identity/identityexpirespamfolderdialog.cpp
+ editor/kmcomposereditorng.cpp
+ editor/encryptionstate.cpp
+ editor/subjectlineeditwithautocorrection.cpp
+ editor/subjectlineeditwithautocorrection.h
+ editor/composer.cpp
+ editor/kmcomposerwin.cpp
+ editor/attachment/attachmentcontroller.cpp
+ editor/attachment/attachmentview.cpp
+ editor/widgets/cryptostateindicatorwidget.cpp
+ editor/validatesendmailshortcut.cpp
+ editor/kmcomposerglobalaction.cpp
+ editor/kmcomposerupdatetemplatejob.cpp
+ editor/kmcomposercreatenewcomposerjob.cpp
+ editor/pimmessagebox.cpp
+ editor/warningwidgets/externaleditorwarning.cpp
+ editor/warningwidgets/attachmentmissingwarning.cpp
+ editor/warningwidgets/incorrectidentityfolderwarning.cpp
+ editor/warningwidgets/attachmentaddedfromexternalwarning.cpp
+ editor/warningwidgets/toomanyrecipientswarning.cpp
+ editor/warningwidgets/nearexpirywarning.cpp
+ editor/potentialphishingemail/potentialphishingemailwarning.cpp
+ editor/potentialphishingemail/potentialphishingemailjob.cpp
+ editor/potentialphishingemail/potentialphishingdetaildialog.cpp
+ editor/potentialphishingemail/potentialphishingdetailwidget.cpp
+ dialog/archivefolderdialog.cpp
+ dialog/addemailtoexistingcontactdialog.cpp
+ dialog/kmknotify.cpp
+ dialog/spellcheckerconfigdialog.cpp
+ job/addressvalidationjob.cpp
+ job/createnewcontactjob.cpp
+ job/addemailtoexistingcontactjob.cpp
+ job/createtaskjob.cpp
+ job/savedraftjob.cpp
+ job/removeduplicatemailjob.cpp
+ job/createfollowupreminderonexistingmessagejob.cpp
+ job/removecollectionjob.cpp
+ job/saveasfilejob.cpp
+ job/markallmessagesasreadinfolderandsubfolderjob.cpp
+ job/removeduplicatemessageinfolderandsubfolderjob.cpp
+ job/handleclickedurljob.cpp
+ job/composenewmessagejob.cpp
+ job/opencomposerjob.cpp
+ job/newmessagejob.cpp
+ job/opencomposerhiddenjob.cpp
+ job/fillcomposerjob.cpp
+ job/createreplymessagejob.cpp
+ job/createforwardmessagejob.cpp
+ job/dndfromarkjob.cpp
+ job/clearcachejobinfolderandsubfolderjob.cpp
+ job/clearcachejobinfolderandsubfolderjob.h
+ widgets/collectionpane.cpp
+ widgets/vacationscriptindicatorwidget.cpp
+ widgets/displaymessageformatactionmenu.cpp
+ widgets/kactionmenutransport.cpp
+ widgets/kactionmenuaccount.cpp
+ widgets/zoomlabelwidget.cpp
+ tag/tagactionmanager.cpp
+ tag/tagselectdialog.cpp
+ tag/tagmonitormanager.cpp
+ plugininterface/kmailplugininterface.cpp
+ plugininterface/kmailplugincheckbeforedeletingmanagerinterface.cpp
+ editor/plugininterface/kmailplugineditormanagerinterface.cpp
+ editor/plugininterface/kmailplugineditorcheckbeforesendmanagerinterface.cpp
+ editor/plugininterface/kmailplugineditorinitmanagerinterface.cpp
+ editor/plugininterface/kmailplugineditorconverttextmanagerinterface.cpp
+ editor/plugininterface/kmailplugingrammareditormanagerinterface.cpp
+ sieveimapinterface/kmailsieveimapinstanceinterface.cpp
+ sieveimapinterface/kmsieveimappasswordprovider.cpp
+ undosend/undosendcombobox.cpp
+ undosend/undosendmanager.cpp
+ undosend/undosendcreatejob.cpp
+ kmmainwin.cpp
+ settings/kmailsettings.cpp
+ kmreaderwin.cpp
+ kmsystemtray.cpp
+ unityservicemanager.cpp
+ undostack.cpp
+ kmkernel.cpp
+ commandlineinfo.h
+ commandlineinfo.cpp
+ kmcommands.cpp
+ kmreadermainwin.cpp
+ kmmainwidget.cpp
+ aboutdata.cpp
+ mailserviceimpl.cpp
+ secondarywindow.cpp
+ util.cpp
+ kmail_options.h
+ messageactions.cpp
+ foldershortcutactionmanager.cpp
+ kmlaunchexternalcomponent.cpp
+ manageshowcollectionproperties.cpp
+ kmail.qrc
+ attributes/taskattribute.h
+ folderarchive/folderarchiveaccountinfo.h
+ folderarchive/folderarchiveutil.h
+ folderarchive/folderarchivecache.h
+ folderarchive/folderarchiveagentcheckcollection.h
+ folderarchive/folderarchivemanager.h
+ folderarchive/folderarchiveagentjob.h
+ collectionpage/collectiontemplatespage.h
+ collectionpage/collectionviewpage.h
+ collectionpage/collectionquotapage.h
+ collectionpage/collectionquotawidget.h
+ collectionpage/collectionmailinglistpage.h
+ collectionpage/collectionshortcutpage.h
+ configuredialog/configagentdelegate.h
+ configuredialog/configuredialoglistview.h
+ configuredialog/configuredialog.h
+ configuredialog/configuredialog_p.h
+ configuredialog/configuremiscpage.h
+ configuredialog/configuresecuritypage.h
+ configuredialog/configurecomposerpage.h
+ configuredialog/configureappearancepage.h
+ configuredialog/configureaccountpage.h
+ configuredialog/configurepluginpage.h
+ configuredialog/colorlistbox.h
+ configuredialog/configureplugins/configurepluginslistwidget.h
+ searchdialog/kmsearchmessagemodel.h
+ searchdialog/searchpatternwarning.h
+ searchdialog/kmailsearchpatternedit.h
+ searchdialog/searchwindowdialog.h
+ searchdialog/searchdescriptionattribute.h
+ searchdialog/incompleteindexdialog.h
+ identity/identitydialog.h
+ identity/xfaceconfigurator.h
+ identity/encodedimagepicker.h
+ identity/newidentitydialog.h
+ identity/identityeditvcarddialog.h
+ identity/identityaddvcarddialog.h
+ identity/identityinvalidfolder.h
+ identity/identityfolderrequester.h
+ editor/kmcomposereditorng.h
+ editor/composer.h
+ editor/encryptionstate.h
+ editor/kmcomposerwin.h
+ editor/attachment/attachmentcontroller.h
+ editor/attachment/attachmentview.h
+ editor/widgets/cryptostateindicatorwidget.h
+ editor/validatesendmailshortcut.h
+ editor/kmcomposerglobalaction.h
+ editor/kmcomposerupdatetemplatejob.h
+ editor/kmcomposercreatenewcomposerjob.h
+ editor/pimmessagebox.h
+ editor/warningwidgets/externaleditorwarning.h
+ editor/warningwidgets/attachmentmissingwarning.h
+ editor/warningwidgets/incorrectidentityfolderwarning.h
+ editor/warningwidgets/attachmentaddedfromexternalwarning.h
+ editor/warningwidgets/toomanyrecipientswarning.h
+ editor/warningwidgets/nearexpirywarning.h
+ editor/potentialphishingemail/potentialphishingemailwarning.h
+ editor/potentialphishingemail/potentialphishingemailjob.h
+ editor/potentialphishingemail/potentialphishingdetaildialog.h
+ editor/potentialphishingemail/potentialphishingdetailwidget.h
+ dialog/archivefolderdialog.h
+ dialog/addemailtoexistingcontactdialog.h
+ dialog/kmknotify.h
+ dialog/spellcheckerconfigdialog.h
+ job/addressvalidationjob.h
+ job/createnewcontactjob.h
+ job/addemailtoexistingcontactjob.h
+ job/createtaskjob.h
+ job/savedraftjob.h
+ job/removeduplicatemailjob.h
+ job/createfollowupreminderonexistingmessagejob.h
+ job/removecollectionjob.h
+ job/saveasfilejob.h
+ job/markallmessagesasreadinfolderandsubfolderjob.h
+ job/removeduplicatemessageinfolderandsubfolderjob.h
+ job/handleclickedurljob.h
+ job/composenewmessagejob.h
+ job/opencomposerjob.h
+ job/newmessagejob.h
+ job/opencomposerhiddenjob.h
+ job/fillcomposerjob.h
+ job/createreplymessagejob.h
+ job/createforwardmessagejob.h
+ job/dndfromarkjob.h
+ widgets/collectionpane.h
+ widgets/vacationscriptindicatorwidget.h
+ widgets/displaymessageformatactionmenu.h
+ widgets/kactionmenutransport.h
+ widgets/kactionmenuaccount.h
+ widgets/zoomlabelwidget.h
+ tag/tagactionmanager.h
+ tag/tagselectdialog.h
+ tag/tagmonitormanager.h
+ plugininterface/kmailplugininterface.h
+ plugininterface/kmailplugincheckbeforedeletingmanagerinterface.h
+ editor/plugininterface/kmailplugineditormanagerinterface.h
+ editor/plugininterface/kmailplugineditorcheckbeforesendmanagerinterface.h
+ editor/plugininterface/kmailplugineditorinitmanagerinterface.h
+ editor/plugininterface/kmailplugineditorconverttextmanagerinterface.h
+ editor/plugininterface/kmailplugingrammareditormanagerinterface.h
+ sieveimapinterface/kmailsieveimapinstanceinterface.h
+ sieveimapinterface/kmsieveimappasswordprovider.h
+ undosend/undosendcombobox.h
+ undosend/undosendmanager.h
+ undosend/undosendcreatejob.h
+ kmmainwin.h
+ settings/kmailsettings.h
+ kmreaderwin.h
+ kmsystemtray.h
+ unityservicemanager.h
+ undostack.h
+ kmkernel.h
+ kmcommands.h
+ kmreadermainwin.h
+ kmmainwidget.h
+ aboutdata.h
+ mailserviceimpl.h
+ secondarywindow.h
+ util.h
+ messageactions.h
+ foldershortcutactionmanager.h
+ kmlaunchexternalcomponent.h
+ manageshowcollectionproperties.h
+ historyswitchfolder/collectionswitchertreeview.cpp
+ historyswitchfolder/collectionswitchertreeview.h
+ historyswitchfolder/collectionswitchertreeviewmanager.h
+ historyswitchfolder/collectionswitchertreeviewmanager.cpp
+ historyswitchfolder/collectionswitchermodel.h
+ historyswitchfolder/collectionswitchermodel.cpp
+ historyclosedreader/historyclosedreaderinfo.h
+ historyclosedreader/historyclosedreaderinfo.cpp
+ historyclosedreader/historyclosedreadermanager.h
+ historyclosedreader/historyclosedreadermanager.cpp
+ historyclosedreader/historyclosedreadermenu.h
+ historyclosedreader/historyclosedreadermenu.cpp
)
if(KMAIL_HAVE_ACTIVITY_SUPPORT)
- target_sources(kmailprivate PRIVATE
- activities/activitiesmanager.h
- activities/activitiesmanager.cpp
-
- activities/transportactivities.h
- activities/transportactivities.cpp
-
- activities/identityactivities.h
- activities/identityactivities.cpp
-
- activities/ldapactivities.cpp
- activities/ldapactivities.h
-
- activities/accountactivities.h
- activities/accountactivities.cpp
-)
+ target_sources(
+ kmailprivate
+ PRIVATE
+ activities/activitiesmanager.h
+ activities/activitiesmanager.cpp
+ activities/transportactivities.h
+ activities/transportactivities.cpp
+ activities/identityactivities.h
+ activities/identityactivities.cpp
+ activities/ldapactivities.cpp
+ activities/ldapactivities.h
+ activities/accountactivities.h
+ activities/accountactivities.cpp
+ )
if(BUILD_TESTING)
- add_subdirectory(activities/autotests)
+ add_subdirectory(activities/autotests)
endif()
endif()
if(KPim6AkonadiSearch_FOUND)
- target_sources(kmailprivate PRIVATE
- search/checkindexingmanager.cpp
- search/checkindexingjob.cpp
- search/checkindexingmanager.h
- search/checkindexingjob.h
+ target_sources(
+ kmailprivate
+ PRIVATE
+ search/checkindexingmanager.cpp
+ search/checkindexingjob.cpp
+ search/checkindexingmanager.h
+ search/checkindexingjob.h
)
endif()
-
qt_add_dbus_adaptor(kmailprivate_LIB_SRCS
${kmail_BINARY_DIR}/src/org.kde.kmail.mailcomposer.xml editor/kmcomposerwin.h KMComposerWin
)
@@ -406,7 +401,6 @@ qt_add_dbus_interfaces(kmailprivate_LIB_SRCS
../agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
)
-
ki18n_wrap_ui(kmailprivate
ui/smimeconfiguration.ui
ui/miscpagemaintab.ui
@@ -444,61 +438,59 @@ endif()
target_sources(kmailprivate PRIVATE ${kmailprivate_LIB_SRCS})
-
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(kmailprivate PROPERTIES UNITY_BUILD ON)
endif()
generate_export_header(kmailprivate BASE_NAME kmail)
-target_link_libraries(kmailprivate
+target_link_libraries(
+ kmailprivate
PRIVATE
- KF6::KCMUtils
- KF6::I18n
- KF6::SonnetUi
- KPim6::Gravatar
- KPim6::Mime
- KPim6::AkonadiCore
- KPim6::AkonadiContactWidgets
- KPim6::AkonadiMime
- KPim6::MessageCore
- KPim6::MessageList
- KPim6::MessageComposer
- KPim6::PimCommon
- KPim6::MailCommon
- KPim6::TemplateParser
- KPim6::IdentityManagementWidgets
- KF6::WindowSystem
- KF6::Notifications
- KF6::GuiAddons
- KF6::Crash
- KF6::KIOFileWidgets
- KF6::NotifyConfig
- KF6::Codecs
- KPim6::MailTransport
- KF6::KCMUtils
- KPim6::Libkleo
- KPim6::KSieveUi
- KF6::KIOCore
- KF6::Contacts
- KPim6::PimTextEdit
- KPim6::MessageViewer
- KF6::IconThemes
- KF6::IconWidgets
- KF6::XmlGui
- KF6::Completion
- KPim6::LdapWidgets
-
- KPim6::WebEngineViewer
- KF6::SyntaxHighlighting
- KF6::GuiAddons
- KF6::TextUtils
- KF6::StatusNotifierItem
- LibGpgError::LibGpgError
- ${kmail_userfeedback_LIB}
+ KF6::KCMUtils
+ KF6::I18n
+ KF6::SonnetUi
+ KPim6::Gravatar
+ KPim6::Mime
+ KPim6::AkonadiCore
+ KPim6::AkonadiContactWidgets
+ KPim6::AkonadiMime
+ KPim6::MessageCore
+ KPim6::MessageList
+ KPim6::MessageComposer
+ KPim6::PimCommon
+ KPim6::MailCommon
+ KPim6::TemplateParser
+ KPim6::IdentityManagementWidgets
+ KF6::WindowSystem
+ KF6::Notifications
+ KF6::GuiAddons
+ KF6::Crash
+ KF6::KIOFileWidgets
+ KF6::NotifyConfig
+ KF6::Codecs
+ KPim6::MailTransport
+ KF6::KCMUtils
+ KPim6::Libkleo
+ KPim6::KSieveUi
+ KF6::KIOCore
+ KF6::Contacts
+ KPim6::PimTextEdit
+ KPim6::MessageViewer
+ KF6::IconThemes
+ KF6::IconWidgets
+ KF6::XmlGui
+ KF6::Completion
+ KPim6::LdapWidgets
+ KPim6::WebEngineViewer
+ KF6::SyntaxHighlighting
+ KF6::GuiAddons
+ KF6::TextUtils
+ KF6::StatusNotifierItem
+ LibGpgError::LibGpgError
+ ${kmail_userfeedback_LIB}
)
if(TARGET KF6::TextEditTextToSpeech)
- target_link_libraries(kmailprivate
- PRIVATE KF6::TextEditTextToSpeech)
+ target_link_libraries(kmailprivate PRIVATE KF6::TextEditTextToSpeech)
endif()
if(KMAIL_HAVE_ACTIVITY_SUPPORT)
@@ -506,33 +498,52 @@ if(KMAIL_HAVE_ACTIVITY_SUPPORT)
endif()
if(KPim6AkonadiSearch_FOUND)
- target_link_libraries(kmailprivate PRIVATE KPim6::AkonadiSearchDebug KPim6::AkonadiSearchPIM)
+ target_link_libraries(
+ kmailprivate
+ PRIVATE KPim6::AkonadiSearchDebug KPim6::AkonadiSearchPIM
+ )
endif()
target_link_libraries(kmailprivate PRIVATE qt6keychain)
-target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KPim6::MessageList,INTERFACE_INCLUDE_DIRECTORIES>)
-target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KPim6::MessageViewer,INTERFACE_INCLUDE_DIRECTORIES>)
-target_include_directories(kmailprivate PUBLIC $<TARGET_PROPERTY:KPim6::MailCommon,INTERFACE_INCLUDE_DIRECTORIES>)
+target_include_directories(
+ kmailprivate
+ PUBLIC $<TARGET_PROPERTY:KPim6::MessageList,INTERFACE_INCLUDE_DIRECTORIES>
+)
+target_include_directories(
+ kmailprivate
+ PUBLIC $<TARGET_PROPERTY:KPim6::MessageViewer,INTERFACE_INCLUDE_DIRECTORIES>
+)
+target_include_directories(
+ kmailprivate
+ PUBLIC $<TARGET_PROPERTY:KPim6::MailCommon,INTERFACE_INCLUDE_DIRECTORIES>
+)
-set_target_properties(kmailprivate
+set_target_properties(
+ kmailprivate
PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION}
)
########### kcm_kmail ###############
add_library(kcm_kmail_static STATIC ${kcm_kmail_PART_SRCS})
target_sources(kcm_kmail_static PRIVATE kcm_kmail.cpp)
-target_link_libraries(kcm_kmail_static kmailprivate KF6::KCMUtils KF6::Completion KF6::I18n )
+target_link_libraries(
+ kcm_kmail_static
+ kmailprivate
+ KF6::KCMUtils
+ KF6::Completion
+ KF6::I18n
+)
kcoreaddons_add_plugin(kcm_kmail_accounts SOURCES configuredialog/kcm_kmail_accounts.cpp INSTALL_NAMESPACE "pim6/kcms/kmail")
target_link_libraries(kcm_kmail_accounts kcm_kmail_static KPim6::AkonadiCore)
kcoreaddons_add_plugin(kcm_kmail_appearance SOURCES configuredialog/kcm_kmail_appearance.cpp INSTALL_NAMESPACE "pim6/kcms/kmail")
-target_link_libraries(kcm_kmail_appearance kcm_kmail_static KPim6::AkonadiCore )
+target_link_libraries(kcm_kmail_appearance kcm_kmail_static KPim6::AkonadiCore)
kcoreaddons_add_plugin(kcm_kmail_composer SOURCES configuredialog/kcm_kmail_composer.cpp INSTALL_NAMESPACE "pim6/kcms/kmail")
-target_link_libraries(kcm_kmail_composer kcm_kmail_static KPim6::AkonadiCore )
+target_link_libraries(kcm_kmail_composer kcm_kmail_static KPim6::AkonadiCore)
kcoreaddons_add_plugin(kcm_kmail_misc SOURCES configuredialog/kcm_kmail_misc.cpp INSTALL_NAMESPACE "pim6/kcms/kmail")
target_link_libraries(kcm_kmail_misc kcm_kmail_static KPim6::AkonadiCore)
@@ -552,7 +563,8 @@ qt_add_dbus_adaptor(kmailpart_PART_SRCS
qt_add_dbus_interfaces(kmailpart_PART_SRCS ${kmail_BINARY_DIR}/src/org.kde.kmail.kmailpart.xml)
add_library(kmailpart MODULE ${kmailpart_PART_SRCS})
-target_link_libraries(kmailpart
+target_link_libraries(
+ kmailpart
kmailprivate
KPim6::AkonadiCore
KF6::I18n
@@ -569,7 +581,8 @@ set(kmail_SRCS main.cpp ${kmail_debugcategory_SRCS})
file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kmail.png")
ecm_add_app_icon(kmail_SRCS ICONS ${ICONS_SRCS})
add_executable(kmail ${kmail_SRCS})
-target_link_libraries(kmail
+target_link_libraries(
+ kmail
KPim6::KontactInterface
kmailprivate
KPim6::AkonadiCore
@@ -597,28 +610,37 @@ if(BUILD_TESTING)
add_subdirectory(historyclosedreader/autotests/)
endif()
########### install files ###############
-install(TARGETS kmailprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
+install(
+ TARGETS kmailprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+ LIBRARY NAMELINK_SKIP
+)
install(TARGETS kmail ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(PROGRAMS data/org.kde.kmail2.desktop data/kmail_view.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/kmail.kcfg
+install(
+ PROGRAMS data/org.kde.kmail2.desktop data/kmail_view.desktop
+ DESTINATION ${KDE_INSTALL_APPDIR}
+)
+install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/kmail.kcfg
DESTINATION ${KDE_INSTALL_KCFGDIR}
)
-install(FILES data/org.kde.kmail2.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
+install(
+ FILES data/org.kde.kmail2.appdata.xml
+ DESTINATION ${KDE_INSTALL_METAINFODIR}
+)
install(FILES data/kmail2.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
-install(TARGETS
- kmailpart
- DESTINATION ${KDE_INSTALL_PLUGINDIR}
-)
-install(FILES
- ${kmail_BINARY_DIR}/src/org.kde.kmail.kmailpart.xml
- ${kmail_BINARY_DIR}/src/org.kde.kmail.kmail.xml
+install(TARGETS kmailpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(
+ FILES
+ ${kmail_BINARY_DIR}/src/org.kde.kmail.kmailpart.xml
+ ${kmail_BINARY_DIR}/src/org.kde.kmail.kmail.xml
DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}
)
configure_file(data/org.kde.kmail.service.in org.kde.kmail.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
-
+install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.service
+ DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}
+)
diff --git a/src/activities/autotests/CMakeLists.txt b/src/activities/autotests/CMakeLists.txt
index fe3e0f1f79..23f882cd07 100644
--- a/src/activities/autotests/CMakeLists.txt
+++ b/src/activities/autotests/CMakeLists.txt
@@ -7,10 +7,12 @@ macro(add_kmail_activities_test _source)
add_executable(${_name} ${_test} ${ARGN} ${_name}.h)
add_test(NAME ${_name} COMMAND ${_name})
ecm_mark_as_test(${_name})
- target_link_libraries(${_name} Qt::Test KPim6::PimCommonActivities kmailprivate)
- set_target_properties(${_name} PROPERTIES
- DISABLE_PRECOMPILE_HEADERS ON
-)
-
+ target_link_libraries(
+ ${_name}
+ Qt::Test
+ KPim6::PimCommonActivities
+ kmailprivate
+ )
+ set_target_properties(${_name} PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
endmacro()
add_kmail_activities_test(activitiesmanagertest.cpp)
diff --git a/src/autotests/CMakeLists.txt b/src/autotests/CMakeLists.txt
index 499669dcaa..3ec6bf297c 100644
--- a/src/autotests/CMakeLists.txt
+++ b/src/autotests/CMakeLists.txt
@@ -2,55 +2,132 @@
# SPDX-License-Identifier: BSD-3-Clause
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
add_definitions(-DTEST_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
-include_directories(
- BEFORE
- ${kmail_SOURCE_DIR}
- ${kmail_BINARY_DIR}
-)
+include_directories(BEFORE ${kmail_SOURCE_DIR} ${kmail_BINARY_DIR})
########### dbus test ###############
-add_executable(displaymessageformatactionmenutest displaymessageformatactionmenutest.cpp displaymessageformatactionmenutest.h)
-add_test(NAME displaymessageformatactionmenutest COMMAND displaymessageformatactionmenutest)
+add_executable(
+ displaymessageformatactionmenutest
+ displaymessageformatactionmenutest.cpp
+ displaymessageformatactionmenutest.h
+)
+add_test(
+ NAME displaymessageformatactionmenutest
+ COMMAND displaymessageformatactionmenutest
+)
ecm_mark_as_test(kmail-displaymessageformatactionmenutest)
-target_link_libraries(displaymessageformatactionmenutest Qt::Test KPim6::MessageViewer KF6::I18n kmailprivate)
+target_link_libraries(
+ displaymessageformatactionmenutest
+ Qt::Test
+ KPim6::MessageViewer
+ KF6::I18n
+ kmailprivate
+)
#####
-add_executable(identityaddvcarddialogtest identityaddvcarddialogtest.cpp identityaddvcarddialogtest.h)
+add_executable(
+ identityaddvcarddialogtest
+ identityaddvcarddialogtest.cpp
+ identityaddvcarddialogtest.h
+)
ecm_mark_as_test(kmail-identityaddvcarddialogtest)
-target_link_libraries(identityaddvcarddialogtest Qt::Test Qt::Widgets KF6::Completion KF6::KIOWidgets KF6::I18n kmailprivate)
+target_link_libraries(
+ identityaddvcarddialogtest
+ Qt::Test
+ Qt::Widgets
+ KF6::Completion
+ KF6::KIOWidgets
+ KF6::I18n
+ kmailprivate
+)
#####
-add_executable(createfollowupreminderonexistingmessagejobtest createfollowupreminderonexistingmessagejobtest.cpp createfollowupreminderonexistingmessagejobtest.h)
+add_executable(
+ createfollowupreminderonexistingmessagejobtest
+ createfollowupreminderonexistingmessagejobtest.cpp
+ createfollowupreminderonexistingmessagejobtest.h
+)
ecm_mark_as_test(kmail_createfollowupreminderonexistingmessagejobtest)
-target_link_libraries(createfollowupreminderonexistingmessagejobtest Qt::Test Qt::Widgets KPim6::AkonadiCore KF6::CalendarCore KPim6::Mime KPim6::MessageComposer kmailprivate)
+target_link_libraries(
+ createfollowupreminderonexistingmessagejobtest
+ Qt::Test
+ Qt::Widgets
+ KPim6::AkonadiCore
+ KF6::CalendarCore
+ KPim6::Mime
+ KPim6::MessageComposer
+ kmailprivate
+)
#####
-add_executable(cryptostateindicatorwidgettest cryptostateindicatorwidgettest.cpp cryptostateindicatorwidgettest.h)
-add_test(NAME cryptostateindicatorwidgettest COMMAND cryptostateindicatorwidgettest)
+add_executable(
+ cryptostateindicatorwidgettest
+ cryptostateindicatorwidgettest.cpp
+ cryptostateindicatorwidgettest.h
+)
+add_test(
+ NAME cryptostateindicatorwidgettest
+ COMMAND cryptostateindicatorwidgettest
+)
ecm_mark_as_test(cryptostateindicatorwidgettest)
-target_link_libraries(cryptostateindicatorwidgettest Qt::Test KPim6::MessageCore Qt::Widgets KF6::I18n kmailprivate)
+target_link_libraries(
+ cryptostateindicatorwidgettest
+ Qt::Test
+ KPim6::MessageCore
+ Qt::Widgets
+ KF6::I18n
+ kmailprivate
+)
#####
-add_executable(encryptionstatetest encryptionstatetest.cpp encryptionstatetest.h)
+add_executable(
+ encryptionstatetest
+ encryptionstatetest.cpp
+ encryptionstatetest.h
+)
add_test(NAME encryptionstatetest COMMAND encryptionstatetest)
ecm_mark_as_test(encryptionstatetest)
target_link_libraries(encryptionstatetest Qt::Test kmailprivate)
-add_executable(kactionmenutransporttest kactionmenutransporttest.cpp kactionmenutransporttest.h)
+add_executable(
+ kactionmenutransporttest
+ kactionmenutransporttest.cpp
+ kactionmenutransporttest.h
+)
add_test(NAME kactionmenutransporttest COMMAND kactionmenutransporttest)
ecm_mark_as_test(kactionmenutransporttest)
-target_link_libraries(kactionmenutransporttest Qt::Test KPim6::AkonadiMime KF6::WidgetsAddons KF6::I18n KF6::ConfigGui kmailprivate)
+target_link_libraries(
+ kactionmenutransporttest
+ Qt::Test
+ KPim6::AkonadiMime
+ KF6::WidgetsAddons
+ KF6::I18n
+ KF6::ConfigGui
+ kmailprivate
+)
add_akonadi_isolated_test_advanced( kmcomposerwintest.cpp "kmcomposerwintest.h"
- "Qt::Test;KPim6::IdentityManagementWidgets;KPim6::Libkleo;KPim6::MessageCore;KPim6::MessageComposer;KPim6::TemplateParser;KF6::XmlGui;Qt::Widgets;KF6::I18n;kmailprivate;KF6::Codecs")
+ "Qt::Test;KPim6::IdentityManagementWidgets;KPim6::Libkleo;KPim6::MessageCore;KPim6::MessageComposer;KPim6::TemplateParser;KF6::XmlGui;Qt::Widgets;KF6::I18n;kmailprivate;KF6::Codecs"
+)
add_akonadi_isolated_test_advanced( tagselectdialogtest.cpp "tagselectdialogtest.h" "kmailprivate;KPim6::MailCommon;KPim6::Libkdepim;KF6::ItemViews;KPim6::TemplateParser;KF6::XmlGui;KF6::Completion;KF6::I18n")
add_akonadi_isolated_test_advanced(kmcommandstest.cpp "kmcommandstest.h"
- "Qt::Test;Qt::Widgets;KPim6::AkonadiCore;KF6::XmlGui;KF6::Bookmarks;KF6::Contacts;KF6::I18n;KPim6::IdentityManagementCore;KF6::KIOCore;KF6::KIOFileWidgets;KPim6::MessageCore;KPim6::MessageComposer;KPim6::MessageList;KPim6::MessageViewer;KPim6::MailCommon;KPim6::AkonadiMime;KPim6::Libkdepim;KPim6::TemplateParser;kmailprivate")
-
+ "Qt::Test;Qt::Widgets;KPim6::AkonadiCore;KF6::XmlGui;KF6::Bookmarks;KF6::Contacts;KF6::I18n;KPim6::IdentityManagementCore;KF6::KIOCore;KF6::KIOFileWidgets;KPim6::MessageCore;KPim6::MessageComposer;KPim6::MessageList;KPim6::MessageViewer;KPim6::MailCommon;KPim6::AkonadiMime;KPim6::Libkdepim;KPim6::TemplateParser;kmailprivate"
+)
-add_executable(commandlineinfotest commandlineinfotest.cpp commandlineinfotest.h)
+add_executable(
+ commandlineinfotest
+ commandlineinfotest.cpp
+ commandlineinfotest.h
+)
add_test(NAME commandlineinfotest COMMAND commandlineinfotest)
ecm_mark_as_test(commandlineinfotest)
-target_link_libraries(commandlineinfotest Qt::Test KPim6::AkonadiMime KF6::WidgetsAddons KF6::I18n KF6::ConfigGui kmailprivate)
+target_link_libraries(
+ commandlineinfotest
+ Qt::Test
+ KPim6::AkonadiMime
+ KF6::WidgetsAddons
+ KF6::I18n
+ KF6::ConfigGui
+ kmailprivate
+)
diff --git a/src/autotests/data/gnupg/gpg.conf b/src/autotests/data/gnupg/gpg.conf
index ca99a0a247..83b18520f3 100644
--- a/src/autotests/data/gnupg/gpg.conf
+++ b/src/autotests/data/gnupg/gpg.conf
@@ -1 +1 @@
-trust-model tofu+pgp
\ No newline at end of file
+trust-model tofu+pgp
diff --git a/src/autotests/multipartmixed.mbox b/src/autotests/multipartmixed.mbox
index a1c593ee02..89a256628f 100644
--- a/src/autotests/multipartmixed.mbox
+++ b/src/autotests/multipartmixed.mbox
@@ -7,4 +7,3 @@ Content-Type: multipart/mixed; boundary="==-=-=";
One empty line above this line.
--==-=-=--
-
diff --git a/src/autotests/signedmail.mbox b/src/autotests/signedmail.mbox
index 1df5f3eed7..a48827e944 100644
--- a/src/autotests/signedmail.mbox
+++ b/src/autotests/signedmail.mbox
@@ -43,9 +43,9 @@ X-UID: 68768
X-Length: 3235
Status: RO
X-Status: RPT
-X-KMail-EncryptionState:
-X-KMail-SignatureState:
-X-KMail-MDN-Sent:
+X-KMail-EncryptionState:
+X-KMail-SignatureState:
+X-KMail-MDN-Sent:
--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="
@@ -108,4 +108,3 @@ HYelJfvqQQJkoW99SKRUVec=
=AmlK
-----END PGP SIGNATURE-----
--==-=-=--
-
diff --git a/src/autotests/unittestenv/xdgconfig/akonadi_knut_resource_0rc b/src/autotests/unittestenv/xdgconfig/akonadi_knut_resource_0rc
index 0d9e3cfe54..04913c76be 100644
--- a/src/autotests/unittestenv/xdgconfig/akonadi_knut_resource_0rc
+++ b/src/autotests/unittestenv/xdgconfig/akonadi_knut_resource_0rc
@@ -1,4 +1,3 @@
[General]
DataFile[$e]=$XDG_DATA_HOME/testdata-res1.xml
FileWatchingEnabled=false
-
diff --git a/src/avscripts/CMakeLists.txt b/src/avscripts/CMakeLists.txt
index c533c47b2d..f462a8e358 100644
--- a/src/avscripts/CMakeLists.txt
+++ b/src/avscripts/CMakeLists.txt
@@ -1,3 +1,6 @@
if(Q_WS_X11)
- install(PROGRAMS kmail_clamav.sh kmail_sav.sh kmail_fprot.sh kmail_antivir.sh DESTINATION ${KDE_INSTALL_BINDIR})
+ install(
+ PROGRAMS kmail_clamav.sh kmail_sav.sh kmail_fprot.sh kmail_antivir.sh
+ DESTINATION ${KDE_INSTALL_BINDIR}
+ )
endif()
diff --git a/src/avscripts/kmail_antivir.sh b/src/avscripts/kmail_antivir.sh
index 153aec5202..5b5c41f8e7 100755
--- a/src/avscripts/kmail_antivir.sh
+++ b/src/avscripts/kmail_antivir.sh
@@ -5,16 +5,16 @@
#
# SPDX-License-Identifier: GPL-2.0-only
#
-TEMPFILE=`mktemp`
-if [ $? != 0 ] ; then
- TEMPFILE=`mktemp /tmp/kmail.XXXXXX`
-fi
+TEMPFILE=$(mktemp)
+if [ $? != 0 ]; then
+ TEMPFILE=$(mktemp /tmp/kmail.XXXXXX)
+fi
export TEMPFILE
-cat > $TEMPFILE
+cat >$TEMPFILE
if antivir --scan-in-archive --scan-in-mbox $TEMPFILE | grep -q ALERT; then
-echo "X-Virus-Flag: yes"
+ echo "X-Virus-Flag: yes"
else
-echo "X-Virus-Flag: no"
+ echo "X-Virus-Flag: no"
fi
cat $TEMPFILE
rm $TEMPFILE
diff --git a/src/avscripts/kmail_clamav.sh b/src/avscripts/kmail_clamav.sh
index 26a4cbbc0b..0148ef83e7 100755
--- a/src/avscripts/kmail_clamav.sh
+++ b/src/avscripts/kmail_clamav.sh
@@ -5,26 +5,26 @@
#
# SPDX-License-Identifier: GPL-2.0-only
#
-TEMPFILE=`mktemp`
-if [ $? != 0 ] ; then
- TEMPFILE=`mktemp /tmp/kmail.XXXXXX`
-fi
+TEMPFILE=$(mktemp)
+if [ $? != 0 ]; then
+ TEMPFILE=$(mktemp /tmp/kmail.XXXXXX)
+fi
export TEMPFILE
-cat > $TEMPFILE
+cat >$TEMPFILE
# check for a running daemon
-if [ "`ps -axo comm|grep clamd`" = "clamd" ]; then
- chmod a+r $TEMPFILE
- CLAMCOMANDO="clamdscan --stdout --no-summary "
+if [ "$(ps -axo comm | grep clamd)" = "clamd" ]; then
+ chmod a+r $TEMPFILE
+ CLAMCOMANDO="clamdscan --stdout --no-summary "
else
- CLAMCOMANDO="clamscan --stdout --no-summary"
+ CLAMCOMANDO="clamscan --stdout --no-summary"
fi
# analyze the message
if $CLAMCOMANDO $TEMPFILE | grep -q FOUND; then
- echo "X-Virus-Flag: yes"
+ echo "X-Virus-Flag: yes"
else
- echo "X-Virus-Flag: no"
+ echo "X-Virus-Flag: no"
fi
cat $TEMPFILE
diff --git a/src/avscripts/kmail_fprot.sh b/src/avscripts/kmail_fprot.sh
index 068ccf3826..23515c7882 100755
--- a/src/avscripts/kmail_fprot.sh
+++ b/src/avscripts/kmail_fprot.sh
@@ -5,28 +5,28 @@
#
# SPDX-License-Identifier: GPL-2.0-only
#
-TEMPFILE=`mktemp`
-if [ $? != 0 ] ; then
- TEMPFILE=`mktemp /tmp/kmail.XXXXXX`
-fi
+TEMPFILE=$(mktemp)
+if [ $? != 0 ]; then
+ TEMPFILE=$(mktemp /tmp/kmail.XXXXXX)
+fi
export TEMPFILE
-cat > $TEMPFILE
-f-prot -archive 3 $TEMPFILE > /dev/null
+cat >$TEMPFILE
+f-prot -archive 3 $TEMPFILE >/dev/null
RC=$?
-if [ $RC -eq 0 ] ; then
- echo "X-Virus-Flag: no"
+if [ $RC -eq 0 ]; then
+ echo "X-Virus-Flag: no"
else
- case $RC in
- 1 ) DESC="no - Unrecoverable error" ;;
- 2 ) DESC="no - Selftest failed" ;;
- 3 ) DESC="yes - Virus-infected object found" ;;
- 4 ) DESC="no - Reserved" ;;
- 5 ) DESC="no - Abnormal termination" ;;
- 6 ) DESC="no - Virus was removed" ;;
- 7 ) DESC="no - Error, out of memory" ;;
- 8 ) DESC="yes - Something suspicious found" ;;
- esac
- echo "X-Virus-Flag: $DESC"
+ case $RC in
+ 1) DESC="no - Unrecoverable error" ;;
+ 2) DESC="no - Selftest failed" ;;
+ 3) DESC="yes - Virus-infected object found" ;;
+ 4) DESC="no - Reserved" ;;
+ 5) DESC="no - Abnormal termination" ;;
+ 6) DESC="no - Virus was removed" ;;
+ 7) DESC="no - Error, out of memory" ;;
+ 8) DESC="yes - Something suspicious found" ;;
+ esac
+ echo "X-Virus-Flag: $DESC"
fi
cat $TEMPFILE
diff --git a/src/avscripts/kmail_sav.sh b/src/avscripts/kmail_sav.sh
index f328a32123..3689fa8a2e 100755
--- a/src/avscripts/kmail_sav.sh
+++ b/src/avscripts/kmail_sav.sh
@@ -4,16 +4,16 @@
# SPDX-FileCopyrightText: 2004 Fred Emmott <fred87 at users.sf.net>
#
# SPDX-License-Identifier: GPL-2.0-only
-TEMPFILE=`mktemp`
-if [ $? != 0 ] ; then
- TEMPFILE=`mktemp /tmp/kmail.XXXXXX`
-fi
+TEMPFILE=$(mktemp)
+if [ $? != 0 ]; then
+ TEMPFILE=$(mktemp /tmp/kmail.XXXXXX)
+fi
export TEMPFILE
-cat > $TEMPFILE
+cat >$TEMPFILE
if sweep -ss -mime $TEMPFILE | grep -q found; then
-echo "X-Virus-Flag: yes"
+ echo "X-Virus-Flag: yes"
else
-echo "X-Virus-Flag: no"
+ echo "X-Virus-Flag: no"
fi
cat $TEMPFILE
rm $TEMPFILE
diff --git a/src/editor/custommimeheader/custommimeheader.kcfgc b/src/editor/custommimeheader/custommimeheader.kcfgc
index 0faa74da90..5fb45a1522 100644
--- a/src/editor/custommimeheader/custommimeheader.kcfgc
+++ b/src/editor/custommimeheader/custommimeheader.kcfgc
@@ -2,4 +2,3 @@ File=custommimeheader.kcfg
ClassName=CustomMimeHeader
Mutators=true
ItemAccessors=true
-
diff --git a/src/editor/potentialphishingemail/autotests/CMakeLists.txt b/src/editor/potentialphishingemail/autotests/CMakeLists.txt
index 056e60c92a..77fca3a430 100644
--- a/src/editor/potentialphishingemail/autotests/CMakeLists.txt
+++ b/src/editor/potentialphishingemail/autotests/CMakeLists.txt
@@ -2,29 +2,80 @@
# SPDX-License-Identifier: BSD-3-Clause
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-add_executable(kmail_potentialphishingemailjobtest potentialphishingemailjobtest.cpp potentialphishingemailjobtest.h)
-add_test(NAME kmail_potentialphishingemailjobtest COMMAND kmail_potentialphishingemailjobtest)
+add_executable(
+ kmail_potentialphishingemailjobtest
+ potentialphishingemailjobtest.cpp
+ potentialphishingemailjobtest.h
+)
+add_test(
+ NAME kmail_potentialphishingemailjobtest
+ COMMAND kmail_potentialphishingemailjobtest
+)
ecm_mark_as_test(kmail_potentialphishingemailjobtest)
-target_link_libraries(kmail_potentialphishingemailjobtest Qt::Test KPim6::PimCommon kmailprivate)
+target_link_libraries(
+ kmail_potentialphishingemailjobtest
+ Qt::Test
+ KPim6::PimCommon
+ kmailprivate
+)
-
-add_executable(kmail_potentialphishingdetaildialogtest potentialphishingdetaildialogtest.cpp potentialphishingdetaildialogtest.h)
-add_test(NAME kmail_potentialphishingdetaildialogtest COMMAND kmail_potentialphishingdetaildialogtest)
+add_executable(
+ kmail_potentialphishingdetaildialogtest
+ potentialphishingdetaildialogtest.cpp
+ potentialphishingdetaildialogtest.h
+)
+add_test(
+ NAME kmail_potentialphishingdetaildialogtest
+ COMMAND kmail_potentialphishingdetaildialogtest
+)
ecm_mark_as_test(kmail_potentialphishingdetaildialogtest)
-target_link_libraries(kmail_potentialphishingdetaildialogtest Qt::Test Qt::Widgets KF6::ConfigCore KF6::I18n KF6::WidgetsAddons kmailprivate)
+target_link_libraries(
+ kmail_potentialphishingdetaildialogtest
+ Qt::Test
+ Qt::Widgets
+ KF6::ConfigCore
+ KF6::I18n
+ KF6::WidgetsAddons
+ kmailprivate
+)
-add_executable(kmail_potentialphishingdetailwidgettest potentialphishingdetailwidgettest.cpp potentialphishingdetailwidgettest.h)
-add_test(NAME kmail_potentialphishingdetailwidgettest COMMAND kmail_potentialphishingdetailwidgettest)
+add_executable(
+ kmail_potentialphishingdetailwidgettest
+ potentialphishingdetailwidgettest.cpp
+ potentialphishingdetailwidgettest.h
+)
+add_test(
+ NAME kmail_potentialphishingdetailwidgettest
+ COMMAND kmail_potentialphishingdetailwidgettest
+)
ecm_mark_as_test(kmail_potentialphishingdetailwidgettest)
-target_link_libraries(kmail_potentialphishingdetailwidgettest Qt::Test Qt::Widgets KF6::ConfigCore KF6::I18n KF6::WidgetsAddons KPim6::PimCommon kmailprivate)
-
-
-
+target_link_libraries(
+ kmail_potentialphishingdetailwidgettest
+ Qt::Test
+ Qt::Widgets
+ KF6::ConfigCore
+ KF6::I18n
+ KF6::WidgetsAddons
+ KPim6::PimCommon
+ kmailprivate
+)
-add_executable(kmail_potentialphishingemailwarningtest potentialphishingemailwarningtest.cpp potentialphishingemailwarningtest.h)
-add_test(NAME kmail_potentialphishingemailwarningtest COMMAND kmail_potentialphishingemailwarningtest)
+add_executable(
+ kmail_potentialphishingemailwarningtest
+ potentialphishingemailwarningtest.cpp
+ potentialphishingemailwarningtest.h
+)
+add_test(
+ NAME kmail_potentialphishingemailwarningtest
+ COMMAND kmail_potentialphishingemailwarningtest
+)
ecm_mark_as_test(kmail_potentialphishingemailwarningtest)
-target_link_libraries(kmail_potentialphishingemailwarningtest Qt::Test Qt::Widgets KF6::ConfigCore KF6::I18n KF6::WidgetsAddons kmailprivate)
-
-
-
+target_link_libraries(
+ kmail_potentialphishingemailwarningtest
+ Qt::Test
+ Qt::Widgets
+ KF6::ConfigCore
+ KF6::I18n
+ KF6::WidgetsAddons
+ kmailprivate
+)
diff --git a/src/editor/warningwidgets/autotests/CMakeLists.txt b/src/editor/warningwidgets/autotests/CMakeLists.txt
index 387a44e466..abc4d6f32e 100644
--- a/src/editor/warningwidgets/autotests/CMakeLists.txt
+++ b/src/editor/warningwidgets/autotests/CMakeLists.txt
@@ -2,18 +2,53 @@
# SPDX-License-Identifier: BSD-3-Clause
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-add_executable(kmail_incorrectidentityfolderwarningtest incorrectidentityfolderwarningtest.cpp incorrectidentityfolderwarningtest.h)
-add_test(NAME kmail_incorrectidentityfolderwarningtest COMMAND kmail_incorrectidentityfolderwarningtest)
+add_executable(
+ kmail_incorrectidentityfolderwarningtest
+ incorrectidentityfolderwarningtest.cpp
+ incorrectidentityfolderwarningtest.h
+)
+add_test(
+ NAME kmail_incorrectidentityfolderwarningtest
+ COMMAND kmail_incorrectidentityfolderwarningtest
+)
ecm_mark_as_test(kmail_incorrectidentityfolderwarningtest)
-target_link_libraries(kmail_incorrectidentityfolderwarningtest Qt::Test KPim6::PimCommon KF6::I18n kmailprivate)
+target_link_libraries(
+ kmail_incorrectidentityfolderwarningtest
+ Qt::Test
+ KPim6::PimCommon
+ KF6::I18n
+ kmailprivate
+)
-
-add_executable(kmail_externaleditorwarningtest externaleditorwarningtest.cpp externaleditorwarningtest.h)
-add_test(NAME kmail_externaleditorwarningtest COMMAND kmail_externaleditorwarningtest)
+add_executable(
+ kmail_externaleditorwarningtest
+ externaleditorwarningtest.cpp
+ externaleditorwarningtest.h
+)
+add_test(
+ NAME kmail_externaleditorwarningtest
+ COMMAND kmail_externaleditorwarningtest
+)
ecm_mark_as_test(kmail_externaleditorwarningtest)
-target_link_libraries(kmail_externaleditorwarningtest Qt::Test KPim6::PimCommon KF6::I18n kmailprivate)
+target_link_libraries(
+ kmail_externaleditorwarningtest
+ Qt::Test
+ KPim6::PimCommon
+ KF6::I18n
+ kmailprivate
+)
-add_executable(kmail_nearexpirywarningtest nearexpirywarningtest.cpp nearexpirywarningtest.h)
+add_executable(
+ kmail_nearexpirywarningtest
+ nearexpirywarningtest.cpp
+ nearexpirywarningtest.h
+)
add_test(NAME kmail_nearexpirywarningtest COMMAND kmail_nearexpirywarningtest)
ecm_mark_as_test(kmail_nearexpirywarningtest)
-target_link_libraries(kmail_nearexpirywarningtest Qt::Test KPim6::PimCommon KF6::I18n kmailprivate)
+target_link_libraries(
+ kmail_nearexpirywarningtest
+ Qt::Test
+ KPim6::PimCommon
+ KF6::I18n
+ kmailprivate
+)
diff --git a/src/folderarchive/autotests/CMakeLists.txt b/src/folderarchive/autotests/CMakeLists.txt
index 6d90b1cebd..bde801ef52 100644
--- a/src/folderarchive/autotests/CMakeLists.txt
+++ b/src/folderarchive/autotests/CMakeLists.txt
@@ -2,13 +2,19 @@
# SPDX-License-Identifier: BSD-3-Clause
# Convenience macro to add unit tests.
macro(folderarchive_kmail _source)
- set(_test ${_source})
- get_filename_component(_name ${_source} NAME_WE)
- add_executable(${_name} ${_test} ${_name}.h)
- add_test(NAME ${_name} COMMAND ${_name})
- ecm_mark_as_test(folderararchive-${_name})
+ set(_test ${_source})
+ get_filename_component(_name ${_source} NAME_WE)
+ add_executable(${_name} ${_test} ${_name}.h)
+ add_test(NAME ${_name} COMMAND ${_name})
+ ecm_mark_as_test(folderararchive-${_name})
- target_link_libraries(${_name} Qt::Test KPim6::AkonadiCore KF6::ConfigCore kmailprivate)
+ target_link_libraries(
+ ${_name}
+ Qt::Test
+ KPim6::AkonadiCore
+ KF6::ConfigCore
+ kmailprivate
+ )
endmacro()
folderarchive_kmail(folderarchiveaccountinfotest.cpp)
diff --git a/src/historyclosedreader/autotests/CMakeLists.txt b/src/historyclosedreader/autotests/CMakeLists.txt
index ac87e5a6fe..a805280456 100644
--- a/src/historyclosedreader/autotests/CMakeLists.txt
+++ b/src/historyclosedreader/autotests/CMakeLists.txt
@@ -2,13 +2,19 @@
# SPDX-License-Identifier: BSD-3-Clause
# Convenience macro to add unit tests.
macro(historyclosedreader_kmail _source)
- set(_test ${_source})
- get_filename_component(_name ${_source} NAME_WE)
- add_executable(${_name} ${_test} ${_name}.h)
- add_test(NAME ${_name} COMMAND ${_name})
- ecm_mark_as_test(historyclosedreader-${_name})
+ set(_test ${_source})
+ get_filename_component(_name ${_source} NAME_WE)
+ add_executable(${_name} ${_test} ${_name}.h)
+ add_test(NAME ${_name} COMMAND ${_name})
+ ecm_mark_as_test(historyclosedreader-${_name})
- target_link_libraries(${_name} Qt::Test KPim6::AkonadiCore KF6::ConfigCore kmailprivate)
+ target_link_libraries(
+ ${_name}
+ Qt::Test
+ KPim6::AkonadiCore
+ KF6::ConfigCore
+ kmailprivate
+ )
endmacro()
historyclosedreader_kmail(historyclosedreaderinfotest.cpp)
diff --git a/src/historyswitchfolder/autotests/CMakeLists.txt b/src/historyswitchfolder/autotests/CMakeLists.txt
index 3270bc4c75..50b131d83a 100644
--- a/src/historyswitchfolder/autotests/CMakeLists.txt
+++ b/src/historyswitchfolder/autotests/CMakeLists.txt
@@ -5,9 +5,8 @@ macro(add_kmail_historyswitchfolder_unittest _source)
ecm_add_test(${_source} ${_name}.h
TEST_NAME ${_name}
LINK_LIBRARIES kmailprivate Qt::Test Qt::Widgets
-)
+ )
endmacro()
-
add_kmail_historyswitchfolder_unittest(collectionswitchertreeviewtest.cpp)
add_kmail_historyswitchfolder_unittest(collectionswitchertreeviewmanagertest.cpp)
diff --git a/src/job/autotests/CMakeLists.txt b/src/job/autotests/CMakeLists.txt
index e7b6f310e7..8dfa33da88 100644
--- a/src/job/autotests/CMakeLists.txt
+++ b/src/job/autotests/CMakeLists.txt
@@ -5,9 +5,8 @@ macro(add_kmail_job_unittest _source)
ecm_add_test(${_source} ${_name}.h
TEST_NAME ${_name}
LINK_LIBRARIES kmailprivate Qt::Test Qt::Widgets KPim6::AkonadiCore
-)
+ )
endmacro()
add_kmail_job_unittest(createreplymessagejobtest.cpp)
add_kmail_job_unittest(createforwardmessagejobtest.cpp)
-
diff --git a/src/kmail_part.rc b/src/kmail_part.rc
index ef96beb1a4..cbcd767fcb 100644
--- a/src/kmail_part.rc
+++ b/src/kmail_part.rc
@@ -83,7 +83,7 @@
<Action name="save_message_display_format"/>
<Action name="reset_message_display_format"/>
<Separator/>
- <Action name="disable_emoticon"/>
+ <Action name="disable_emoticon"/>
<Separator/>
<Action name="toggle_fixedfont"/>
<Separator/>
@@ -253,7 +253,7 @@
<Action name="search_messages" />
<Action name="akonadi_move_to_trash" />
<Separator/>
- <Action name="akonadi_collection_remove_from_favorites"/>
+ <Action name="akonadi_collection_remove_from_favorites"/>
<Action name="akonadi_collection_rename_favorite"/>
<Separator/>
<Action name="expire_settings"/>
@@ -356,7 +356,7 @@
<ActionList name="toolbar_messagetag_actions" />
<Action name="create_todo"/>
<Separator/>
- <ActionList name="kmail_toolbar_actions"/>
+ <ActionList name="kmail_toolbar_actions"/>
<Spacer/>
<Action name="hamburger_menu"/>
</ToolBar>
diff --git a/src/kmcomposerui.rc b/src/kmcomposerui.rc
index 802c6cb3e1..d88149450f 100644
--- a/src/kmcomposerui.rc
+++ b/src/kmcomposerui.rc
@@ -18,7 +18,7 @@
<Action name="file_print_preview"/>
<Action name="file_print" />
<Separator/>
- <ActionList name="kmaileditor_plugins_file"/>
+ <ActionList name="kmaileditor_plugins_file"/>
<Separator/>
<Action name="file_close" />
</Menu>
@@ -32,7 +32,7 @@
<Action name="tools_quote"/>
<Action name="tools_unquote"/>
<Separator/>
- <ActionList name="kmaileditor_plugins_edit"/>
+ <ActionList name="kmaileditor_plugins_edit"/>
</Menu>
<Menu name="insert" >
<text>Insert</text>
@@ -115,7 +115,7 @@
<Action name="html" />
<Separator/>
<Action name="spellcheck" />
- <Separator/>
+ <Separator/>
<Action name="attach_menu" />
<Separator/>
<Action name="sign_message" />
diff --git a/src/kmmainwin.rc b/src/kmmainwin.rc
index 3ca4609b3e..05cfe7b637 100644
--- a/src/kmmainwin.rc
+++ b/src/kmmainwin.rc
@@ -83,7 +83,7 @@
<Action name="save_message_display_format"/>
<Action name="reset_message_display_format"/>
<Separator/>
- <Action name="disable_emoticon"/>
+ <Action name="disable_emoticon"/>
<Separator/>
<Action name="toggle_fixedfont"/>
<Separator/>
@@ -256,7 +256,7 @@
<Action name="search_messages" />
<Action name="akonadi_move_to_trash" />
<Separator/>
- <Action name="akonadi_collection_remove_from_favorites"/>
+ <Action name="akonadi_collection_remove_from_favorites"/>
<Action name="akonadi_collection_rename_favorite"/>
<Separator/>
<Action name="expire_settings"/>
@@ -359,7 +359,7 @@
<ActionList name="toolbar_messagetag_actions" />
<Action name="create_todo"/>
<Separator/>
- <ActionList name="kmail_toolbar_actions"/>
+ <ActionList name="kmail_toolbar_actions"/>
<Spacer/>
<Action name="hamburger_menu"/>
</ToolBar>
diff --git a/src/kontactplugin/kmail/CMakeLists.txt b/src/kontactplugin/kmail/CMakeLists.txt
index e9cb33dad8..479e7a41b0 100644
--- a/src/kontactplugin/kmail/CMakeLists.txt
+++ b/src/kontactplugin/kmail/CMakeLists.txt
@@ -10,26 +10,65 @@ ecm_qt_declare_logging_category(kontact_kmail_plugins_interface_common_SRCS HEAD
EXPORT KMAIL
)
-
set(kontact_kmail_plugins_interface_SRCS)
qt_add_dbus_interfaces(kontact_kmail_plugins_interface_SRCS ${kmail_BINARY_DIR}/src/org.kde.kmail.kmail.xml)
add_library(kontact_kmailplugin MODULE)
-target_sources(kontact_kmailplugin PRIVATE kmail_plugin.cpp summarywidget.cpp kmail_plugin.h summarywidget.h ${kontact_kmail_plugins_interface_SRCS} ${kontact_kmail_plugins_interface_common_SRCS})
+target_sources(
+ kontact_kmailplugin
+ PRIVATE
+ kmail_plugin.cpp
+ summarywidget.cpp
+ kmail_plugin.h
+ summarywidget.h
+ ${kontact_kmail_plugins_interface_SRCS}
+ ${kontact_kmail_plugins_interface_common_SRCS}
+)
add_dependencies(kontact_kmailplugin kmail_xml)
-target_link_libraries(kontact_kmailplugin KPim6::Mime KF6::I18n KPim6::KontactInterface KF6::CalendarCore KPim6::CalendarUtils KPim6::AkonadiCore KF6::Contacts KPim6::AkonadiWidgets Qt::DBus)
+target_link_libraries(
+ kontact_kmailplugin
+ KPim6::Mime
+ KF6::I18n
+ KPim6::KontactInterface
+ KF6::CalendarCore
+ KPim6::CalendarUtils
+ KPim6::AkonadiCore
+ KF6::Contacts
+ KPim6::AkonadiWidgets
+ Qt::DBus
+)
########### next target ###############
add_library(kcmkmailsummary MODULE)
-target_sources(kcmkmailsummary PRIVATE kcmkmailsummary.cpp kcmkmailsummary.h ${kontact_kmail_plugins_interface_SRCS} ${kontact_kmail_plugins_interface_common_SRCS})
+target_sources(
+ kcmkmailsummary
+ PRIVATE
+ kcmkmailsummary.cpp
+ kcmkmailsummary.h
+ ${kontact_kmail_plugins_interface_SRCS}
+ ${kontact_kmail_plugins_interface_common_SRCS}
+)
add_dependencies(kcmkmailsummary kmail_xml)
-target_link_libraries(kcmkmailsummary KF6::KCMUtils KPim6::Mime KPim6::PimCommonAkonadi Qt::DBus KF6::I18n)
+target_link_libraries(
+ kcmkmailsummary
+ KF6::KCMUtils
+ KPim6::Mime
+ KPim6::PimCommonAkonadi
+ Qt::DBus
+ KF6::I18n
+)
########### install files ###############
-install(TARGETS kontact_kmailplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kontact)
+install(
+ TARGETS kontact_kmailplugin
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kontact
+)
-install(TARGETS kcmkmailsummary DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/summary/)
+install(
+ TARGETS kcmkmailsummary
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/summary/
+)
diff --git a/src/kontactplugin/summary/CMakeLists.txt b/src/kontactplugin/summary/CMakeLists.txt
index 0b8a2cef8a..aca3d0f482 100644
--- a/src/kontactplugin/summary/CMakeLists.txt
+++ b/src/kontactplugin/summary/CMakeLists.txt
@@ -2,24 +2,51 @@
# SPDX-License-Identifier: BSD-3-Clause
########### next target ###############
-set(kontact_summaryplugin_PART_SRCS summaryview_plugin.cpp summaryview_part.cpp dropwidget.cpp summaryview.qrc
- summaryview_plugin.h summaryview_part.h dropwidget.h)
+set(kontact_summaryplugin_PART_SRCS
+ summaryview_plugin.cpp
+ summaryview_part.cpp
+ dropwidget.cpp
+ summaryview.qrc
+ summaryview_plugin.h
+ summaryview_part.h
+ dropwidget.h
+)
qt_add_dbus_interfaces(kontact_summaryplugin_PART_SRCS ${kmail_BINARY_DIR}/src/org.kde.kmail.kmail.xml)
add_library(kontact_summaryplugin MODULE ${kontact_summaryplugin_PART_SRCS})
add_dependencies(kontact_summaryplugin kmail_xml)
-target_link_libraries(kontact_summaryplugin KF6::KCMUtils KF6::I18n KPim6::IdentityManagementCore KPim6::KontactInterface KPim6::PimCommon KF6::ConfigCore)
+target_link_libraries(
+ kontact_summaryplugin
+ KF6::KCMUtils
+ KF6::I18n
+ KPim6::IdentityManagementCore
+ KPim6::KontactInterface
+ KPim6::PimCommon
+ KF6::ConfigCore
+)
########### next target ###############
add_library(kcmkontactsummary MODULE kcmkontactsummary.cpp kcmkontactsummary.h)
-target_link_libraries(kcmkontactsummary KF6::KCMUtils KF6::I18n Qt::Widgets KF6::I18n KPim6::KontactInterface)
+target_link_libraries(
+ kcmkontactsummary
+ KF6::KCMUtils
+ KF6::I18n
+ Qt::Widgets
+ KF6::I18n
+ KPim6::KontactInterface
+)
########### install files ###############
-install(TARGETS kontact_summaryplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kontact)
-install(TARGETS kcmkontactsummary DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/summary)
-
+install(
+ TARGETS kontact_summaryplugin
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kontact
+)
+install(
+ TARGETS kcmkontactsummary
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/summary
+)
diff --git a/src/pics/CMakeLists.txt b/src/pics/CMakeLists.txt
index eb041b031e..d4eb21f945 100644
--- a/src/pics/CMakeLists.txt
+++ b/src/pics/CMakeLists.txt
@@ -1,7 +1,5 @@
# SPDX-FileCopyrightText: none
# SPDX-License-Identifier: BSD-3-Clause
-set(pics
-pgp-keys.png
-)
+set(pics pgp-keys.png)
install(FILES ${pics} DESTINATION ${KDE_INSTALL_DATADIR}/kmail2/pics)
diff --git a/src/scripts/mh2kmail b/src/scripts/mh2kmail
index 7a25d5f0fc..bc250be537 100755
--- a/src/scripts/mh2kmail
+++ b/src/scripts/mh2kmail
@@ -8,8 +8,8 @@
# SPDX-License-Identifier: GPL-2.0-only
#
if [ "X$*" = "X" ]; then
- echo "usage: mh2kmail <dirname>"
- exit 0
+ echo "usage: mh2kmail <dirname>"
+ exit 0
fi
MH_DIR=$1
@@ -18,10 +18,9 @@ FOLDER=${MH_DIR}.mbx
# remove old kmail folder if any
rm -f $FOLDER
-for f in `/bin/ls $MH_DIR|sed -e :a -e 's/^.\{1,5\}$/ &/;ta'|sort`; do
- echo "From ???@??? 00:00:00 1997 +0000" >> $FOLDER
- cat $MH_DIR/$f >> $FOLDER
+for f in $(/bin/ls $MH_DIR | sed -e :a -e 's/^.\{1,5\}$/ &/;ta' | sort); do
+ echo "From ???@??? 00:00:00 1997 +0000" >>$FOLDER
+ cat $MH_DIR/$f >>$FOLDER
done
echo "Done. Messages stored in file $FOLDER."
-
diff --git a/src/scripts/mh2kmailr b/src/scripts/mh2kmailr
index 8b43fd5c98..c67ede3517 100755
--- a/src/scripts/mh2kmailr
+++ b/src/scripts/mh2kmailr
@@ -8,22 +8,22 @@
# SPDX-License-Identifier: GPL-2.0-only
#
if [ "X$*" = "X" ]; then
- echo "usage: mh2kmailr <dirname>"
- exit 0
+ echo "usage: mh2kmailr <dirname>"
+ exit 0
fi
MH_DIR=$1
-for d in `/usr/bin/find $MH_DIR -type d -print|sed -e :a -e 's/^.\{1,5\}$/ &/;ta'|sort`; do
-FOLDER=${d}.mbx
+for d in $(/usr/bin/find $MH_DIR -type d -print | sed -e :a -e 's/^.\{1,5\}$/ &/;ta' | sort); do
+ FOLDER=${d}.mbx
-# remove old kmail folder if any
-rm -f $FOLDER
+ # remove old kmail folder if any
+ rm -f $FOLDER
-for f in `/usr/bin/find $d -type f -maxdepth 1 -print|sed -e :a -e 's/^.\{1,5\}$/ &/;ta'|sort`; do
- echo "From ???@??? 00:00:00 1997 +0000" >> $FOLDER
- cat $f >> $FOLDER
-done
+ for f in $(/usr/bin/find $d -type f -maxdepth 1 -print | sed -e :a -e 's/^.\{1,5\}$/ &/;ta' | sort); do
+ echo "From ???@??? 00:00:00 1997 +0000" >>$FOLDER
+ cat $f >>$FOLDER
+ done
-echo "Done. Messages stored in file $FOLDER."
+ echo "Done. Messages stored in file $FOLDER."
done
diff --git a/src/settings/kmail.kcfg.in b/src/settings/kmail.kcfg.in
index 0f4b304f61..7de698913d 100644
--- a/src/settings/kmail.kcfg.in
+++ b/src/settings/kmail.kcfg.in
@@ -82,7 +82,7 @@
<group name="General">
<entry key="PlasmaActivitySupport" type="Bool">
- <default>false</default>
+ <default>false</default>
</entry>
<entry name="WarnBeforeExpire" type="Bool" key="warn-before-expire">
<default>true</default>
@@ -98,7 +98,7 @@
<entry name="ShowUnreadInTaskbar" type="Bool">
<label>Show Unread Email in TaskBar</label>
<default>true</default>
- </entry>
+ </entry>
<entry name="ExternalEditor" type="String" key="external-editor">
<label>Specify e&ditor:</label>
<default>kwrite %f</default>
diff --git a/src/sieveimapinterface/tests/sievedebugdialog/CMakeLists.txt b/src/sieveimapinterface/tests/sievedebugdialog/CMakeLists.txt
index 5185357978..b544dc0671 100644
--- a/src/sieveimapinterface/tests/sievedebugdialog/CMakeLists.txt
+++ b/src/sieveimapinterface/tests/sievedebugdialog/CMakeLists.txt
@@ -2,12 +2,13 @@
# SPDX-License-Identifier: BSD-3-Clause
add_executable(sievedebugdialog sievedebugdialog.cpp)
-target_link_libraries(sievedebugdialog
- KPim6::KSieve
- KPim6::KSieveUi
- KPim6::AkonadiCore
- KF6::SyntaxHighlighting
- kmailprivate
+target_link_libraries(
+ sievedebugdialog
+ KPim6::KSieve
+ KPim6::KSieveUi
+ KPim6::AkonadiCore
+ KF6::SyntaxHighlighting
+ kmailprivate
)
target_link_libraries(sievedebugdialog qt6keychain)
diff --git a/src/sieveimapinterface/tests/sievemanagerdialog/CMakeLists.txt b/src/sieveimapinterface/tests/sievemanagerdialog/CMakeLists.txt
index 1d5f224d35..1452174d8d 100644
--- a/src/sieveimapinterface/tests/sievemanagerdialog/CMakeLists.txt
+++ b/src/sieveimapinterface/tests/sievemanagerdialog/CMakeLists.txt
@@ -2,10 +2,11 @@
# SPDX-License-Identifier: BSD-3-Clause
add_executable(sievemanagerdialog sievemanagerdialog.cpp)
-target_link_libraries(sievemanagerdialog
- KPim6::KSieveUi
- KPim6::AkonadiCore
- kmailprivate
+target_link_libraries(
+ sievemanagerdialog
+ KPim6::KSieveUi
+ KPim6::AkonadiCore
+ kmailprivate
)
target_link_libraries(sievemanagerdialog qt6keychain)
diff --git a/src/sieveimapinterface/tests/vacation/CMakeLists.txt b/src/sieveimapinterface/tests/vacation/CMakeLists.txt
index 358708e77c..70563cba83 100644
--- a/src/sieveimapinterface/tests/vacation/CMakeLists.txt
+++ b/src/sieveimapinterface/tests/vacation/CMakeLists.txt
@@ -1,7 +1,12 @@
# SPDX-FileCopyrightText: none
# SPDX-License-Identifier: BSD-3-Clause
add_executable(vacationmultiservertest main.cpp)
-target_link_libraries(vacationmultiservertest KPim6::KSieveUi KF6::I18n KPim6::AkonadiCore kmailprivate)
-
+target_link_libraries(
+ vacationmultiservertest
+ KPim6::KSieveUi
+ KF6::I18n
+ KPim6::AkonadiCore
+ kmailprivate
+)
target_link_libraries(vacationmultiservertest qt6keychain)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index c999ebe12b..889e17b151 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -10,10 +10,14 @@ add_dependencies(dbustest kmail_xml)
target_link_libraries(dbustest KF6::KIOCore KF6::I18n Qt::DBus)
#####
-add_executable(searchdbustest searchdbustest.cpp searchdbustest.h)
-target_link_libraries(searchdbustest Qt::DBus Qt::Widgets KPim6::PimCommonAkonadi)
+add_executable(searchdbustest searchdbustest.cpp searchdbustest.h)
+target_link_libraries(
+ searchdbustest
+ Qt::DBus
+ Qt::Widgets
+ KPim6::PimCommonAkonadi
+)
#####
add_executable(searchmailertest searchmailertest.cpp)
target_link_libraries(searchmailertest KPim6::MailCommon)
-
diff --git a/src/undosend/autotests/CMakeLists.txt b/src/undosend/autotests/CMakeLists.txt
index 3b0c3ad319..ca921d7a4a 100644
--- a/src/undosend/autotests/CMakeLists.txt
+++ b/src/undosend/autotests/CMakeLists.txt
@@ -5,7 +5,7 @@ macro(add_kmail_undosend_unittest _source)
ecm_add_test(${_source} ${_name}.h
TEST_NAME ${_name}
LINK_LIBRARIES kmailprivate Qt::Test Qt::Widgets
-)
+ )
endmacro()
add_kmail_undosend_unittest(undosendcomboboxtest.cpp)
More information about the kde-doc-english
mailing list