diff --git a/CMakeLists.txt b/CMakeLists.txt index ed4570f3..eaae8925 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,161 +1,161 @@ cmake_minimum_required(VERSION 3.1) set(PIM_VERSION "5.9.40") project(kdepim-addons VERSION ${PIM_VERSION}) if(POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() -set(KF5_VERSION "5.49.0") +set(KF5_VERSION "5.50.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) # Do NOT add quote set(KDEPIM_DEV_VERSION alpha) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") endif() set(KDEPIMADDONS_VERSION_NUMBER ${PIM_VERSION}) set(KDEPIMADDONS_VERSION "${KDEPIMADDONS_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") set(KDEPIMADDONS_LIB_VERSION "${KDEPIMADDONS_VERSION_NUMBER}") set(KDEPIMADDONS_LIB_SOVERSION "5") set(AKONADINOTES_LIB_VERSION "5.9.40") set(QT_REQUIRED_VERSION "5.9.0") include(ECMOptionalAddSubdirectory) include(ECMInstallIcons) include(ECMSetupVersion) include(ECMAddTests) include(ECMMarkNonGuiExecutable) include(GenerateExportHeader) include(ECMGenerateHeaders) include(CMakePackageConfigHelpers) include(FeatureSummary) include(CheckFunctionExists) include(ECMGeneratePriFile) include(ECMCoverageOption) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) option(KDEPIMADDONS_BUILD_EXAMPLES "Build the kdepim-addons example applications." TRUE) 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(KMAIL_EDITORCONVERTERPLUGIN_BUILD "Build the kmail editor converter plugin." FALSE) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets Widgets Test) find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Declarative ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5SyntaxHighlighting ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Parts ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Prison ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Holidays ${KF5_VERSION} CONFIG REQUIRED) set(MAILCOMMON_LIB_VERSION "5.9.40") set(GRAVATAR_LIB_VERSION "5.9.40") set(PIMCOMMON_LIB_VERSION "5.9.41") set(GRANTLEETHEME_LIB_VERSION "5.9.40") set(CALENDARSUPPORT_LIB_VERSION "5.9.40") set(EVENTVIEW_LIB_VERSION "5.9.40") set(LIBKDEPIM_LIB_VERSION "5.9.40") set(KDEPIM_APPS_LIB_VERSION "5.9.40") set(LIBKLEO_LIB_VERSION "5.9.40") set(AKONADI_LIB_VERSION "5.9.40") set(INCIDENCEEDITOR_LIB_VERSION "5.9.40") set(KTNEF_LIB_VERSION "5.9.40") set(MESSAGELIB_LIB_VERSION "5.9.46") set(AKONADICALENDAR_LIB_VERSION "5.9.40") set(CALENDAR_UTILS_VERSION "5.9.40") set(KPIMTEXTEDIT_LIB_VERSION "5.9.41") set(KIMAP_LIB_VERSION "5.9.40") set(LIBKSIEVE_LIB_VERSION "5.9.40") set(KMAILTRANSPORT_LIB_VERSION "5.9.41") set(AKONADICONTACT_LIB_VERSION "5.9.40") set(IMPORTWIZARD_LIB_VERSION "5.9.40") set(MAILIMPORTER_LIB_VERSION "5.9.40") set(KPIMPKPASS_LIB_VERSION "5.9.40") set(KPIMITINERARY_LIB_VERSION "5.9.46") find_package(KF5CalendarUtils ${CALENDAR_UTILS_VERSION} CONFIG REQUIRED) find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5TemplateParser ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION} CONFIG REQUIRED) find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5KaddressbookImportExport ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED) find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED) find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED) find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED) find_package(KF5IncidenceEditor ${INCIDENCEEDITOR_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MessageCore ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MessageComposer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MessageList ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Gravatar ${GRAVATAR_LIB_VERSION} CONFIG REQUIRED) find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5IdentityManagement ${KIDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED) find_package(KF5LibKSieve ${LIBKSIEVE_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Tnef ${KTNEF_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED) find_package(KPimImportWizard ${IMPORTWIZARD_LIB_VERSION} CONFIG) find_package(KF5MailImporterAkonadi ${MAILIMPORTER_LIB_VERSION} CONFIG REQUIRED) find_package(KPimPkPass ${KPIMPKPASS_LIB_VERSION} CONFIG REQUIRED) find_package(KPimItinerary ${KPIMITINERARY_LIB_VERSION} CONFIG REQUIRED) add_definitions(-DQT_NO_CAST_FROM_ASCII) add_definitions(-DQT_NO_CAST_TO_ASCII) add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) add_definitions(-DQT_NO_URL_CAST_FROM_STRING) if(KDEPIM_ENTERPRISE_BUILD) set(KDEPIM_ENTERPRISE_BUILD true) else() set(KDEPIM_ENTERPRISE_BUILD false) endif() # Extra package find_package(Gpgmepp 1.8.0 CONFIG) set_package_properties(Gpgmepp PROPERTIES DESCRIPTION "GpgME library" URL "http://www.gnupg.org" TYPE REQUIRED) if(KDEPIMADDONS_BUILD_EXAMPLES) add_subdirectory(examples) endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}) add_subdirectory(plugins) add_subdirectory(korganizer) add_subdirectory(kmail) add_subdirectory(kaddressbook) add_subdirectory(akregator) add_subdirectory(sieveeditor) add_subdirectory(kmailtransport) if(KPimImportWizard_FOUND) add_subdirectory(akonadi-import-wizard) endif() install(FILES kdepim-addons.categories kdepim-addons.renamecategories DESTINATION ${KDE_INSTALL_CONFDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.cpp b/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.cpp index 4cd5dce7..99a74aeb 100644 --- a/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.cpp +++ b/kmail/editorplugins/zoomtext/zoomtextplugineditorinterface.cpp @@ -1,126 +1,117 @@ /* Copyright (C) 2016-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "zoomtextplugineditorinterface.h" #include "zoomtexteditorplugin_debug.h" #include "zoomlabel.h" -#include #include #include #include #include #include ZoomTextPluginEditorInterface::ZoomTextPluginEditorInterface(QObject *parent) : MessageComposer::PluginEditorInterface(parent) { } ZoomTextPluginEditorInterface::~ZoomTextPluginEditorInterface() { } void ZoomTextPluginEditorInterface::createAction(KActionCollection *ac) { KActionMenu *zoomMenu = new KActionMenu(i18n("Zoom..."), this); ac->addAction(QStringLiteral("zoom_menu"), zoomMenu); QAction *zoomInAction = KStandardAction::zoomIn(this, &ZoomTextPluginEditorInterface::slotZoomIn, this); zoomMenu->addAction(zoomInAction); ac->addAction(QStringLiteral("zoom_in"), zoomInAction); QAction *zoomOutAction = KStandardAction::zoomOut(this, &ZoomTextPluginEditorInterface::slotZoomOut, this); zoomMenu->addAction(zoomOutAction); ac->addAction(QStringLiteral("zoom_out"), zoomOutAction); zoomMenu->addSeparator(); -#if KCONFIG_VERSION < QT_VERSION_CHECK(5, 50, 0) - QAction *zoomResetAction = new QAction(i18n("Reset"), this); - zoomMenu->addAction(zoomResetAction); - ac->addAction(QStringLiteral("zoom_reset"), zoomResetAction); - connect(zoomResetAction, &QAction::triggered, this, &ZoomTextPluginEditorInterface::slotZoomReset); - ac->setDefaultShortcut(zoomResetAction, QKeySequence(Qt::CTRL + Qt::Key_0)); -#else QAction *zoomResetAction = KStandardAction::actualSize(this, &ZoomTextPluginEditorInterface::slotZoomReset, this); ac->addAction(QStringLiteral("zoom_reset"), zoomResetAction); zoomMenu->addAction(zoomResetAction); -#endif MessageComposer::PluginActionType type(zoomMenu, MessageComposer::PluginActionType::Edit); setActionType(type); mZoomLabelWidget = new ZoomLabel; connect(this, &ZoomTextPluginEditorInterface::zoomFactorChanged, mZoomLabelWidget, &ZoomLabel::setZoomLabel); setStatusBarWidget(mZoomLabelWidget); } void ZoomTextPluginEditorInterface::slotZoomOut() { mType = ZoomOut; Q_EMIT emitPluginActivated(this); } void ZoomTextPluginEditorInterface::slotZoomIn() { mType = ZoomIn; Q_EMIT emitPluginActivated(this); } void ZoomTextPluginEditorInterface::slotZoomReset() { mType = ZoomReset; Q_EMIT emitPluginActivated(this); } void ZoomTextPluginEditorInterface::exec() { switch (mType) { case Unknown: qCDebug(KMAIL_EDITOR_ZOOMTEXT_PLUGIN_LOG) << " There is an error here. We can't call this plugin with unknown type"; break; case ZoomReset: zoomReset(); break; case ZoomIn: zoomIn(); break; case ZoomOut: zoomOut(); break; } mType = Unknown; } void ZoomTextPluginEditorInterface::zoomReset() { richTextEditor()->slotZoomReset(); Q_EMIT zoomFactorChanged(richTextEditor()->zoomFactor()); } void ZoomTextPluginEditorInterface::zoomIn() { richTextEditor()->zoomIn(); Q_EMIT zoomFactorChanged(richTextEditor()->zoomFactor()); } void ZoomTextPluginEditorInterface::zoomOut() { richTextEditor()->zoomOut(); Q_EMIT zoomFactorChanged(richTextEditor()->zoomFactor()); }