diff --git a/resources/ews/CMakeLists.txt b/resources/ews/CMakeLists.txt index 4cfb357fc..36a813994 100644 --- a/resources/ews/CMakeLists.txt +++ b/resources/ews/CMakeLists.txt @@ -1,171 +1,180 @@ # # Copyright (C) 2015-2017 Krzysztof Nowicki # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public # License as published by the Free Software Foundation; either # version 2 of the License, or (at your option) any later version. # # This library 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 # Library General Public License for more details. # # You should have received a copy of the GNU Library General Public License # along with this library; see the file COPYING.LIB. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. # Build a separate resource for sending e-mail. This is needed for KMail which assumes that # a single resource is not able to both send and receive e-mail. set(HAVE_SEPARATE_MTA_RESOURCE TRUE) set(AKONADI_EWS_VERSION ${KDEPIM_RUNTIME_VERSION}) add_subdirectory(ewsclient) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ewsconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/ewsconfig.h) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ewsclient) include_directories(${CMAKE_CURRENT_BINARY_DIR}/ewsclient) add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_ews_resource\") set(ewsresource_SRCS abchperson/ewsabchpersonhandler.cpp abchperson/ewscreateabchpersonjob.cpp abchperson/ewsfetchabchpersondetailjob.cpp abchperson/ewsmodifyabchpersonjob.cpp calendar/ewscalendarhandler.cpp calendar/ewscreatecalendarjob.cpp calendar/ewsfetchcalendardetailjob.cpp calendar/ewsmodifycalendarjob.cpp contact/ewscontacthandler.cpp contact/ewscreatecontactjob.cpp contact/ewsfetchcontactdetailjob.cpp contact/ewsmodifycontactjob.cpp mail/ewscreatemailjob.cpp mail/ewsfetchmaildetailjob.cpp mail/ewsmailhandler.cpp mail/ewsmodifymailjob.cpp tags/ewsakonaditagssyncjob.cpp tags/ewsglobaltagsreadjob.cpp tags/ewsglobaltagswritejob.cpp tags/ewstagstore.cpp tags/ewsupdateitemstagsjob.cpp task/ewscreatetaskjob.cpp task/ewsfetchtaskdetailjob.cpp task/ewsmodifytaskjob.cpp task/ewstaskhandler.cpp ewsautodiscoveryjob.cpp ewsconfigdialog.cpp ewscreateitemjob.cpp ewsfetchfoldersjob.cpp ewsfetchfoldersincrjob.cpp ewsfetchitemsjob.cpp ewsfetchitemdetailjob.cpp ewsitemhandler.cpp ewsmodifyitemjob.cpp ewsmodifyitemflagsjob.cpp ewsprogressdialog.cpp ewsresource.cpp ewssettings.cpp ewssubscribedfoldersjob.cpp ewssubscriptionmanager.cpp ewssubscriptionwidget.cpp) ecm_qt_declare_logging_category(ewsresource_SRCS HEADER ewsres_debug.h IDENTIFIER EWSRES_LOG CATEGORY_NAME org.kde.pim.ews) ecm_qt_declare_logging_category(ewsresource_SRCS HEADER ewsres_agentif_debug.h IDENTIFIER EWSRES_AGENTIF_LOG CATEGORY_NAME org.kde.pim.ews.agentif) ki18n_wrap_ui(ewsresource_SRCS ewsconfigdialog.ui) kconfig_add_kcfg_files(ewsresource_SRCS ewssettingsbase.kcfgc) kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/ewsresource.kcfg org.kde.Akonadi.Ews.Settings) qt5_add_dbus_adaptor(ewsresource_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Ews.Settings.xml ewssettings.h EwsSettings ewssettingsadaptor EwsSettingsAdaptor ) qt5_generate_dbus_interface( ${CMAKE_CURRENT_SOURCE_DIR}/ewsresource.h org.kde.Akonadi.Ews.Resource.xml OPTIONS -a ) qt5_add_dbus_adaptor(ewsresource_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Ews.Resource.xml ewsresource.h EwsResource ewsresourceadaptor EwsResourceAdaptor ) qt5_generate_dbus_interface( ${CMAKE_CURRENT_SOURCE_DIR}/ewssettings.h org.kde.Akonadi.Ews.Wallet.xml OPTIONS -a ) qt5_add_dbus_adaptor(ewsresource_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Ews.Wallet.xml ewssettings.h EwsSettings ewswalletadaptor EwsWalletAdaptor ) add_executable(akonadi_ews_resource ${ewsresource_SRCS}) target_link_libraries(akonadi_ews_resource KF5::AkonadiAgentBase KF5::AkonadiCore KF5::AkonadiMime KF5::KIOCore KF5::Mime KF5::CalendarCore KF5::Contacts KF5::Wallet KF5::WidgetsAddons KF5::I18n KF5::WindowSystem ewsclient) if (HAVE_SEPARATE_MTA_RESOURCE) set(ewsmtaresource_SRCS ewsmtaconfigdialog.cpp ewsmtaresource.cpp) ki18n_wrap_ui(ewsmtaresource_SRCS ewsmtaconfigdialog.ui) kconfig_add_kcfg_files(ewsmtaresource_SRCS ewsmtasettings.kcfgc) kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/ewsmtaresource.kcfg org.kde.Akonadi.EwsMta.Settings) qt5_add_dbus_adaptor(ewsmtaresource_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.EwsMta.Settings.xml ewsmtasettings.h EwsMtaSettings ewsmtasettingsadaptor ) qt5_add_dbus_interface(ewsmtaresource_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Ews.Resource.xml ewsresourceinterface) add_executable(akonadi_ewsmta_resource ${ewsmtaresource_SRCS}) target_link_libraries(akonadi_ewsmta_resource KF5::AkonadiAgentBase KF5::AkonadiCore KF5::AkonadiWidgets KF5::I18n KF5::WindowSystem KF5::Mime) set(EWS_MTA_CAPABILITIES "X-EwsMailTransport") else (HAVE_SEPARATE_MTA_RESOURCE) set(EWS_MTA_CAPABILITIES "MailTransport,Synchronizable") endif (HAVE_SEPARATE_MTA_RESOURCE) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ewsresource.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/ewsresource.desktop) if (BUILD_TESTING) add_subdirectory(test) endif (BUILD_TESTING) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ewsresource.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents" ) install(TARGETS akonadi_ews_resource ${INSTALL_TARGETS_DEFAULT_ARGS}) if (HAVE_SEPARATE_MTA_RESOURCE) install(FILES ewsmtaresource.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents" ) install(TARGETS akonadi_ewsmta_resource ${INSTALL_TARGETS_DEFAULT_ARGS}) endif (HAVE_SEPARATE_MTA_RESOURCE) -foreach(icon_resolution 16 22 24 32 48 64 72 96 128) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/akonadi-ews-${icon_resolution}.png - DESTINATION "${KDE_INSTALL_ICONDIR}/hicolor/${icon_resolution}x${icon_resolution}/apps/" - RENAME "akonadi-ews.png") -endforeach(icon_resolution) +ecm_install_icons( + ICONS + icons/16-apps-akonadi-ews.png + icons/22-apps-akonadi-ews.png + icons/24-apps-akonadi-ews.png + icons/32-apps-akonadi-ews.png + icons/48-apps-akonadi-ews.png + icons/64-apps-akonadi-ews.png + icons/72-apps-akonadi-ews.png + icons/96-apps-akonadi-ews.png + icons/128-apps-akonadi-ews.png + DESTINATION ${KDE_INSTALL_ICONDIR} + THEME hicolor +) diff --git a/resources/ews/icons/akonadi-ews-128.png b/resources/ews/icons/128-apps-akonadi-ews.png similarity index 100% rename from resources/ews/icons/akonadi-ews-128.png rename to resources/ews/icons/128-apps-akonadi-ews.png diff --git a/resources/ews/icons/akonadi-ews-16.png b/resources/ews/icons/16-apps-akonadi-ews.png similarity index 100% rename from resources/ews/icons/akonadi-ews-16.png rename to resources/ews/icons/16-apps-akonadi-ews.png diff --git a/resources/ews/icons/akonadi-ews-22.png b/resources/ews/icons/22-apps-akonadi-ews.png similarity index 100% rename from resources/ews/icons/akonadi-ews-22.png rename to resources/ews/icons/22-apps-akonadi-ews.png diff --git a/resources/ews/icons/akonadi-ews-24.png b/resources/ews/icons/24-apps-akonadi-ews.png similarity index 100% rename from resources/ews/icons/akonadi-ews-24.png rename to resources/ews/icons/24-apps-akonadi-ews.png diff --git a/resources/ews/icons/akonadi-ews-32.png b/resources/ews/icons/32-apps-akonadi-ews.png similarity index 100% rename from resources/ews/icons/akonadi-ews-32.png rename to resources/ews/icons/32-apps-akonadi-ews.png diff --git a/resources/ews/icons/akonadi-ews-48.png b/resources/ews/icons/48-apps-akonadi-ews.png similarity index 100% rename from resources/ews/icons/akonadi-ews-48.png rename to resources/ews/icons/48-apps-akonadi-ews.png diff --git a/resources/ews/icons/akonadi-ews-64.png b/resources/ews/icons/64-apps-akonadi-ews.png similarity index 100% rename from resources/ews/icons/akonadi-ews-64.png rename to resources/ews/icons/64-apps-akonadi-ews.png diff --git a/resources/ews/icons/akonadi-ews-72.png b/resources/ews/icons/72-apps-akonadi-ews.png similarity index 100% rename from resources/ews/icons/akonadi-ews-72.png rename to resources/ews/icons/72-apps-akonadi-ews.png diff --git a/resources/ews/icons/akonadi-ews-96.png b/resources/ews/icons/96-apps-akonadi-ews.png similarity index 100% rename from resources/ews/icons/akonadi-ews-96.png rename to resources/ews/icons/96-apps-akonadi-ews.png