diff --git a/kdepim/CMakeLists.txt b/kdepim/CMakeLists.txt index 1406dd58..bdea212d 100644 --- a/kdepim/CMakeLists.txt +++ b/kdepim/CMakeLists.txt @@ -6,7 +6,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules") ############### Build Options ############### option(KDEPIM_BUILD_EXAMPLES "Build the kdepim example applications." FALSE) -option(KDEPIM_BUILD_MOBILE "Build the mobile applications. Note that you have to enable KDEPIM_MOBILE_UI if you want to run these applications on a mobile device." TRUE) +# TODO: drop this entirely +option(KDEPIM_BUILD_MOBILE "Build the mobile applications. Note that you have to enable KDEPIM_MOBILE_UI if you want to run these applications on a mobile device." 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) option(KDEPIM_MOBILE_UI "Build UI for mobile devices instead of for desktops" FALSE) option(KDEPIM_ONLY_KLEO "Only build Kleopatra. This option will build only libkleo and kleopatra" FALSE) @@ -29,19 +30,13 @@ if(KDEPIM_ENTERPRISE_BUILD) message(STATUS "Enterprise build is enabled.") endif() -# if KDEPIM_ONLY_KLEO is defined, KDEPIM_BUILD_MOBILE and KDEPIM_MOBILE_UI are disabled. +# if KDEPIM_ONLY_KLEO is defined, KDEPIM_MOBILE_UI are disabled. if(KDEPIM_ONLY_KLEO) - set(KDEPIM_BUILD_MOBILE FALSE) set(KDEPIM_MOBILE_UI FALSE) set(KDEPIM_DEFINITIONS "-DHAVE_CONFIG_H=1") message(STATUS "Only libkleo and Kleopatra will be built.") endif() -if(KDEPIM_MOBILE_UI) - # Build the mobile applications - set(KDEPIM_BUILD_MOBILE TRUE) -endif() - # config-enterprise.h is needed for both ENTERPRISE_BUILD and BUILD_EVERYTHING configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h ) @@ -176,10 +171,21 @@ else() set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgMe library" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "QGpgME is required to build KMail, KOrganizer and Kleopatra") find_package(Grantlee 0.3.0 QUIET CONFIG) - set_package_properties(Grantlee PROPERTIES DESCRIPTION "The Grantlee Template System" URL "http://www.gitorious.org/grantlee/pages/Home" TYPE REQUIRED PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)." ) + set_package_properties(Grantlee PROPERTIES + DESCRIPTION "The Grantlee Template System" + URL "http://www.gitorious.org/grantlee/pages/Home" + TYPE REQUIRED + PURPOSE "Grantlee is requires for kmail and templating, theming for KJots, KaddressBook, KNotes and MessageViewer(KMail)." + ) find_package(Baloo 4.14.0 QUIET CONFIG) - set_package_properties(Baloo PROPERTIES DESCRIPTION "The Baloo libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Baloo provides search capabilities in KMail and Akonadi") + set_package_properties(Baloo PROPERTIES + DESCRIPTION "The Baloo libraries" + URL "http://www.kde.org" + # FIXME: rip it off + # TYPE REQUIRED + PURPOSE "Baloo provides search capabilities in KMail and Akonadi" + ) # Xsltproc find_package(Xsltproc) @@ -200,21 +206,6 @@ else() endif() - -############### Desktop vs. Mobile options ############## - - if(KDEPIM_MOBILE_UI) - add_definitions( -DKDEPIM_MOBILE_UI ) - if(NOT QT_QTDECLARATIVE_FOUND) - message(FATAL_ERROR "The QtDeclarative (QML) module is required for building the mobile UI") - endif() - else() - if(NOT QT_QTDECLARATIVE_FOUND) - message(STATUS "The Qt Declarative (QML) module was not found. The mobile applications will not be built.") - set(KDEPIM_BUILD_MOBILE FALSE) - endif() - endif() - ############### Needed commands before building anything ############### add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS} ${AKONADI_DEFINITIONS}) @@ -263,9 +254,6 @@ else() add_subdirectory(mailcommon) # TODO: does this make sense?!? macro_optional_add_subdirectory(kmail) macro_optional_add_subdirectory(grantleeeditor) - if(KDEPIM_BUILD_MOBILE) - add_subdirectory(mobile) - endif() if(KDEPIM_BUILD_EXAMPLES) add_subdirectory(examples) diff --git a/kdepim/agents/archivemailagent/CMakeLists.txt b/kdepim/agents/archivemailagent/CMakeLists.txt index b5a2be2d..653d9703 100644 --- a/kdepim/agents/archivemailagent/CMakeLists.txt +++ b/kdepim/agents/archivemailagent/CMakeLists.txt @@ -26,9 +26,7 @@ qt4_add_dbus_adaptor(archivemailagent_SRCS org.freedesktop.Akonadi.ArchiveMailAg set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) -kde4_add_ui_files(archivemailagent_SRCS ui/archivemailwidget.ui ) - -kde4_add_executable(akonadi_archivemail_agent ${archivemailagent_SRCS}) +add_executable(akonadi_archivemail_agent ${archivemailagent_SRCS}) target_link_libraries(akonadi_archivemail_agent ${KDEPIMLIBS_AKONADI_LIBS} @@ -39,15 +37,11 @@ target_link_libraries(akonadi_archivemail_agent mailcommon ) -if (Q_WS_MAC) - set_target_properties(akonadi_archivemail_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/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 ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(FILES archivemailagent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents") install(FILES akonadi_archivemail_agent.notifyrc DESTINATION "${DATA_INSTALL_DIR}/akonadi_archivemail_agent" ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdepim/agents/archivemailagent/ui/archivemailwidget.ui b/kdepim/agents/archivemailagent/archivemailwidget.ui similarity index 100% rename from kdepim/agents/archivemailagent/ui/archivemailwidget.ui rename to kdepim/agents/archivemailagent/archivemailwidget.ui diff --git a/kdepim/agents/followupreminderagent/CMakeLists.txt b/kdepim/agents/followupreminderagent/CMakeLists.txt index cad9cd05..49e2e3b5 100644 --- a/kdepim/agents/followupreminderagent/CMakeLists.txt +++ b/kdepim/agents/followupreminderagent/CMakeLists.txt @@ -6,6 +6,10 @@ include_directories( ${CMAKE_SOURCE_DIR}/messagecomposer/ ) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() + set(followupreminderlib_SRCS followupreminderinfo.cpp followupreminderutil.cpp @@ -16,7 +20,7 @@ kde4_add_kcfg_files(followupreminderlib_SRCS ) -kde4_add_library( followupreminder ${LIBRARY_TYPE} ${followupreminderlib_SRCS} ) +add_library( followupreminder ${LIBRARY_TYPE} ${followupreminderlib_SRCS} ) target_link_libraries( followupreminder ${KDE4_KDEUI_LIBS} ) set_target_properties( followupreminder PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) @@ -41,7 +45,7 @@ set(followupreminderagent_SRCS qt4_add_dbus_adaptor(followupreminderagent_SRCS org.freedesktop.Akonadi.FollowUpReminder.xml followupreminderagent.h FollowUpReminderAgent) -kde4_add_executable(akonadi_followupreminder_agent ${followupreminderagent_SRCS}) +add_executable(akonadi_followupreminder_agent ${followupreminderagent_SRCS}) target_link_libraries(akonadi_followupreminder_agent ${KDEPIMLIBS_AKONADI_LIBS} @@ -51,17 +55,9 @@ target_link_libraries(akonadi_followupreminder_agent followupreminder ) -if (Q_WS_MAC) - set_target_properties(akonadi_followupreminder_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/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 ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(FILES followupreminder.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents") -add_subdirectory(tests) - install(FILES akonadi_followupreminder_agent.notifyrc DESTINATION "${DATA_INSTALL_DIR}/akonadi_followupreminder_agent" ) diff --git a/kdepim/agents/mailfilteragent/CMakeLists.txt b/kdepim/agents/mailfilteragent/CMakeLists.txt index 7ea888cc..8b62c11e 100644 --- a/kdepim/agents/mailfilteragent/CMakeLists.txt +++ b/kdepim/agents/mailfilteragent/CMakeLists.txt @@ -24,7 +24,7 @@ qt4_add_dbus_adaptor(akonadi_mailfilter_agent_SRCS org.freedesktop.Akonadi.MailF #kde4_add_kcfg_files(akonadi_mailfilter_agent_SRCS settings.kcfgc) #kde4_add_ui_files(akonadi_mailfilter_agent_SRCS configdialog.ui) -kde4_add_executable(akonadi_mailfilter_agent ${akonadi_mailfilter_agent_SRCS}) +add_executable(akonadi_mailfilter_agent ${akonadi_mailfilter_agent_SRCS}) if (Q_WS_MAC) set_target_properties(akonadi_mailfilter_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template) diff --git a/kdepim/agents/notesagent/CMakeLists.txt b/kdepim/agents/notesagent/CMakeLists.txt index b6d65e55..bff9ebe2 100644 --- a/kdepim/agents/notesagent/CMakeLists.txt +++ b/kdepim/agents/notesagent/CMakeLists.txt @@ -23,7 +23,7 @@ qt4_add_dbus_adaptor(notesagent_SRCS org.freedesktop.Akonadi.NotesAgent.xml note set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) -kde4_add_executable(akonadi_notes_agent ${notesagent_SRCS}) +add_executable(akonadi_notes_agent ${notesagent_SRCS}) target_link_libraries(akonadi_notes_agent ${KDEPIMLIBS_AKONADI_LIBS} diff --git a/kdepim/agents/sendlateragent/CMakeLists.txt b/kdepim/agents/sendlateragent/CMakeLists.txt index f07332b8..52e2798c 100644 --- a/kdepim/agents/sendlateragent/CMakeLists.txt +++ b/kdepim/agents/sendlateragent/CMakeLists.txt @@ -8,7 +8,9 @@ include_directories( ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set(sendlaterlib_SRCS sendlaterinfo.cpp @@ -21,10 +23,7 @@ kde4_add_kcfg_files(sendlaterlib_SRCS settings/sendlateragentsettings.kcfgc ) -kde4_add_ui_files(sendlaterlib_SRCS ui/sendlaterwidget.ui) - - -kde4_add_library( sendlater ${LIBRARY_TYPE} ${sendlaterlib_SRCS} ) +add_library( sendlater ${LIBRARY_TYPE} ${sendlaterlib_SRCS} ) target_link_libraries( sendlater ${KDE4_KDEUI_LIBS} ) set_target_properties( sendlater PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) @@ -48,9 +47,7 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) qt4_add_dbus_adaptor(sendlateragent_SRCS org.freedesktop.Akonadi.SendLaterAgent.xml sendlateragent.h SendLaterAgent) -kde4_add_ui_files(sendlateragent_SRCS ui/sendlaterconfigurewidget.ui) - -kde4_add_executable(akonadi_sendlater_agent ${sendlateragent_SRCS}) +add_executable(akonadi_sendlater_agent ${sendlateragent_SRCS}) target_link_libraries(akonadi_sendlater_agent sendlater @@ -63,12 +60,6 @@ target_link_libraries(akonadi_sendlater_agent pimcommon ) -if (Q_WS_MAC) - set_target_properties(akonadi_sendlater_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template) - set_target_properties(akonadi_sendlater_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.sendlater") - set_target_properties(akonadi_sendlater_agent PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Send Later") -endif () - install(TARGETS akonadi_sendlater_agent ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(FILES sendlateragent.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents") diff --git a/kdepim/agents/sendlateragent/ui/sendlaterconfigurewidget.ui b/kdepim/agents/sendlateragent/sendlaterconfigurewidget.ui similarity index 100% rename from kdepim/agents/sendlateragent/ui/sendlaterconfigurewidget.ui rename to kdepim/agents/sendlateragent/sendlaterconfigurewidget.ui diff --git a/kdepim/agents/sendlateragent/ui/sendlaterwidget.ui b/kdepim/agents/sendlateragent/sendlaterwidget.ui similarity index 100% rename from kdepim/agents/sendlateragent/ui/sendlaterwidget.ui rename to kdepim/agents/sendlateragent/sendlaterwidget.ui diff --git a/kdepim/akonadi_next/CMakeLists.txt b/kdepim/akonadi_next/CMakeLists.txt index 5c34eb54..6e7c7cfa 100644 --- a/kdepim/akonadi_next/CMakeLists.txt +++ b/kdepim/akonadi_next/CMakeLists.txt @@ -31,7 +31,7 @@ set(akonadi_next_SRCS amazingdelegate.cpp ) -kde4_add_library(akonadi_next ${LIBRARY_TYPE} ${akonadi_next_SRCS}) +add_library(akonadi_next ${LIBRARY_TYPE} ${akonadi_next_SRCS}) target_link_libraries(akonadi_next ${AKONADI_COMMON_LIBRARIES} diff --git a/kdepim/akonadiconsole/CMakeLists.txt b/kdepim/akonadiconsole/CMakeLists.txt index ec487311..4f29d799 100644 --- a/kdepim/akonadiconsole/CMakeLists.txt +++ b/kdepim/akonadiconsole/CMakeLists.txt @@ -77,23 +77,7 @@ qt4_add_dbus_interface(akonadiconsole_bin_SRCS storagedebuggerinterface ) -kde4_add_ui_files(akonadiconsole_bin_SRCS - agentwidget.ui - agentconfigdialog.ui - browserwidget_itemview.ui - collectionattributespage.ui - collectionaclpage.ui - dbbrowser.ui - dbconsole.ui - instanceselector.ui - rawsocketconsole.ui - browserwidget_contentview.ui - collectioninternalspage.ui -) - -kde4_add_app_icon(akonadiconsole_bin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-akonadiconsole.png") - -kde4_add_executable(akonadiconsole_bin ${akonadiconsole_bin_SRCS}) +add_executable(akonadiconsole_bin ${akonadiconsole_bin_SRCS}) set_target_properties(akonadiconsole_bin PROPERTIES OUTPUT_NAME akonadiconsole) target_link_libraries(akonadiconsole_bin diff --git a/kdepim/blogilo/src/CMakeLists.txt b/kdepim/blogilo/src/CMakeLists.txt index c06a569a..72239de3 100644 --- a/kdepim/blogilo/src/CMakeLists.txt +++ b/kdepim/blogilo/src/CMakeLists.txt @@ -59,7 +59,7 @@ kde4_add_ui_files( kde4_add_kcfg_files( blogilo_SRCS settings.kcfgc) kde4_add_app_icon(blogilo_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-blogilo.png") -kde4_add_executable( blogilo ${blogilo_SRCS}) +add_executable( blogilo ${blogilo_SRCS}) target_link_libraries( blogilo kdepim ${KDE4_KDEUI_LIBS} ${QT_QTSQL_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KDEWEBKIT_LIBRARY} ${KDEPIMLIBS_KBLOG_LIBS} ${LibKGAPI2_LIBRARY} composereditorng pimcommon) diff --git a/kdepim/calendarsupport/CMakeLists.txt b/kdepim/calendarsupport/CMakeLists.txt index f43a57ee..eb6b4bd0 100644 --- a/kdepim/calendarsupport/CMakeLists.txt +++ b/kdepim/calendarsupport/CMakeLists.txt @@ -36,21 +36,11 @@ set(calendarsupport_LIB_SRCS next/incidenceviewer.cpp ) -kde4_add_ui_files(calendarsupport_LIB_SRCS - printing/calprintdayconfig_base.ui - printing/calprintincidenceconfig_base.ui - printing/calprintjournalconfig_base.ui - printing/calprintmonthconfig_base.ui - printing/calprinttodoconfig_base.ui - printing/calprintweekconfig_base.ui - printing/calprintyearconfig_base.ui -) - kde4_add_kcfg_files(calendarsupport_LIB_SRCS kcalprefs_base.kcfgc) # qt4_add_dbus_interface(calendarsupport_LIB_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.Akonadi.CalendarSearchAgent.xml calendarsearchinterface) -kde4_add_library(calendarsupport ${LIBRARY_TYPE} ${calendarsupport_LIB_SRCS}) +add_library(calendarsupport ${LIBRARY_TYPE} ${calendarsupport_LIB_SRCS}) target_link_libraries( calendarsupport diff --git a/kdepim/calendarviews/CMakeLists.txt b/kdepim/calendarviews/CMakeLists.txt index 516233fa..5f870e5e 100644 --- a/kdepim/calendarviews/CMakeLists.txt +++ b/kdepim/calendarviews/CMakeLists.txt @@ -87,11 +87,7 @@ set(eventviews_LIB_SRCS kde4_add_kcfg_files(eventviews_LIB_SRCS prefs_base.kcfgc) -kde4_add_ui_files(eventviews_LIB_SRCS - agenda/timescaleedit_base.ui -) - -kde4_add_library(eventviews ${LIBRARY_TYPE} ${eventviews_LIB_SRCS}) +add_library(eventviews ${LIBRARY_TYPE} ${eventviews_LIB_SRCS}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") diff --git a/kdepim/calendarviews/viewerapp/CMakeLists.txt b/kdepim/calendarviews/viewerapp/CMakeLists.txt index 14c77ac7..f2c8a1d2 100644 --- a/kdepim/calendarviews/viewerapp/CMakeLists.txt +++ b/kdepim/calendarviews/viewerapp/CMakeLists.txt @@ -17,7 +17,7 @@ kde4_add_ui_files(viewerapp_SRCS mainwindow.ui ) -kde4_add_executable(viewerapp ${viewerapp_SRCS}) +add_executable(viewerapp ${viewerapp_SRCS}) target_link_libraries(viewerapp calendarsupport diff --git a/kdepim/composereditor-ng/CMakeLists.txt b/kdepim/composereditor-ng/CMakeLists.txt index d08bca09..6d8b3e18 100644 --- a/kdepim/composereditor-ng/CMakeLists.txt +++ b/kdepim/composereditor-ng/CMakeLists.txt @@ -8,7 +8,6 @@ add_definitions( -DQT_NO_CAST_TO_ASCII ) #add_subdirectory(tests) add_definitions(-DQT_STATICPLUGIN) -qt4_wrap_cpp(wk_HEADERS_MOC spellplugin/qwebkitplatformplugin.h) set(libcomposereditor_ng_SRCS composereditor.cpp @@ -38,18 +37,13 @@ set(libcomposereditor_ng_SRCS spellplugin/kspellplugin.cpp widgets/domtreewidget.cpp widgets/findreplacebar.cpp - ${wk_HEADERS_MOC} ) kde4_add_kcfg_files(libcomposereditor_ng_SRCS globalsettings_base.kcfgc ) - -kde4_add_ui_files(libcomposereditor_ng_SRCS ui/pagecolorbackgroundwidget.ui ) - - -kde4_add_library(composereditorng ${LIBRARY_TYPE} ${libcomposereditor_ng_SRCS}) +add_library(composereditorng ${LIBRARY_TYPE} ${libcomposereditor_ng_SRCS}) target_link_libraries(composereditorng ${KDE4_KDEWEBKIT_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDE4_KPRINTUTILS_LIBS} diff --git a/kdepim/console/calendarjanitor/CMakeLists.txt b/kdepim/console/calendarjanitor/CMakeLists.txt index 3de3bbcf..315c8658 100644 --- a/kdepim/console/calendarjanitor/CMakeLists.txt +++ b/kdepim/console/calendarjanitor/CMakeLists.txt @@ -22,11 +22,8 @@ include_directories( ${QT_INCLUDES} ${ZLIB_INCLUDE_DIRS} ) - -kde4_add_app_icon(calendarjanitor_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-calendar.png") - -kde4_add_executable(calendarjanitor NOGUI ${calendarjanitor_SRCS}) +add_executable(calendarjanitor ${calendarjanitor_SRCS}) target_link_libraries(calendarjanitor ${KDE4_KDECORE_LIBS} diff --git a/kdepim/console/kabcclient/src/CMakeLists.txt b/kdepim/console/kabcclient/src/CMakeLists.txt index 0964a0bf..3da75ded 100644 --- a/kdepim/console/kabcclient/src/CMakeLists.txt +++ b/kdepim/console/kabcclient/src/CMakeLists.txt @@ -17,21 +17,12 @@ SET(kabcclient_SRCS outputformatimpls.cpp) -# todo: more appropriate icon? -kde4_add_app_icon(kabcclient_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-address-book.png") - -kde4_add_executable(kabcclient NOGUI ${kabcclient_SRCS}) +add_executable(kabcclient ${kabcclient_SRCS}) target_link_libraries(kabcclient ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ) install(TARGETS kabcclient ${INSTALL_TARGETS_DEFAULT_ARGS}) -if(NOT WIN32) #note: kabcclient acts as kabc2mutt invoked with that name install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kabcclient DESTINATION ${BIN_INSTALL_DIR} RENAME kabc2mutt) -else() -kde4_add_executable(kabc2mutt NOGUI ${kabcclient_SRCS}) -target_link_libraries(kabc2mutt ${KDEPIMLIBS_KABC_LIBS} ${KDE4_KDEUI_LIBS} ) -install(TARGETS kabc2mutt ${INSTALL_TARGETS_DEFAULT_ARGS}) -endif() diff --git a/kdepim/console/konsolekalendar/CMakeLists.txt b/kdepim/console/konsolekalendar/CMakeLists.txt index d449fd15..aebf7961 100644 --- a/kdepim/console/konsolekalendar/CMakeLists.txt +++ b/kdepim/console/konsolekalendar/CMakeLists.txt @@ -29,11 +29,8 @@ include_directories( ${QT_INCLUDES} ${ZLIB_INCLUDE_DIRS} ) - -kde4_add_app_icon(konsolekalendar_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-calendar.png") - -kde4_add_executable(konsolekalendar NOGUI ${konsolekalendar_SRCS}) +add_executable(konsolekalendar ${konsolekalendar_SRCS}) target_link_libraries(konsolekalendar ${KDE4_KDECORE_LIBS} diff --git a/kdepim/examples/akonablog/CMakeLists.txt b/kdepim/examples/akonablog/CMakeLists.txt index 62d59e31..c451c48e 100644 --- a/kdepim/examples/akonablog/CMakeLists.txt +++ b/kdepim/examples/akonablog/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( kde4_add_app_icon(akonablog_bin_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/email.png") -kde4_add_executable(akonablog_bin ${akonablog_bin_SRCS}) +add_executable(akonablog_bin ${akonablog_bin_SRCS}) set_target_properties(akonablog_bin PROPERTIES OUTPUT_NAME akonablog) target_link_libraries(akonablog_bin ${KDEPIMLIBS_AKONADI_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDEPIMLIBS_MICROBLOG_LIBS}) diff --git a/kdepim/examples/akonalendar/CMakeLists.txt b/kdepim/examples/akonalendar/CMakeLists.txt index fbb063a3..66bec933 100644 --- a/kdepim/examples/akonalendar/CMakeLists.txt +++ b/kdepim/examples/akonalendar/CMakeLists.txt @@ -7,7 +7,7 @@ set(calendar_bin_SRCS ) -kde4_add_executable(akonalendar_bin ${calendar_bin_SRCS}) +add_executable(akonalendar_bin ${calendar_bin_SRCS}) set_target_properties(akonalendar_bin PROPERTIES OUTPUT_NAME akonalendar) target_link_libraries(akonalendar_bin ${KDEPIMLIBS_AKONADI_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS} calendarsupport) diff --git a/kdepim/examples/coisceim/CMakeLists.txt b/kdepim/examples/coisceim/CMakeLists.txt index 62c7ffe5..a77d8b7c 100644 --- a/kdepim/examples/coisceim/CMakeLists.txt +++ b/kdepim/examples/coisceim/CMakeLists.txt @@ -32,7 +32,7 @@ set (coisceim_part_SRCS coisceimpart.cpp ) -kde4_add_library(coisceim_widget ${LIBRARY_TYPE} ${coisceim_widget_SRCS}) +add_library(coisceim_widget ${LIBRARY_TYPE} ${coisceim_widget_SRCS}) qt4_generate_dbus_interface(coisceimwidget.h org.kde.coisceim.CoisceimWidget.xml @@ -55,7 +55,7 @@ set_target_properties(coisceim_widget PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) -kde4_add_executable(coisceim ${coisceim_SRCS}) +add_executable(coisceim ${coisceim_SRCS}) target_link_libraries(coisceim coisceim_widget diff --git a/kdepim/examples/coisceim/coisceim-mobile/CMakeLists.txt b/kdepim/examples/coisceim/coisceim-mobile/CMakeLists.txt index 36d2f3ad..ad84c44b 100644 --- a/kdepim/examples/coisceim/coisceim-mobile/CMakeLists.txt +++ b/kdepim/examples/coisceim/coisceim-mobile/CMakeLists.txt @@ -11,7 +11,7 @@ set(coisceim_mobile_srcs messageviewitem.cpp ) -kde4_add_executable(coisceim-mobile ${coisceim_mobile_srcs}) +add_executable(coisceim-mobile ${coisceim_mobile_srcs}) target_link_libraries(coisceim-mobile ${QT_QTDECLARATIVE_LIBRARIES} diff --git a/kdepim/examples/etm_usage/CMakeLists.txt b/kdepim/examples/etm_usage/CMakeLists.txt index e9d1716c..3ad68696 100644 --- a/kdepim/examples/etm_usage/CMakeLists.txt +++ b/kdepim/examples/etm_usage/CMakeLists.txt @@ -34,7 +34,7 @@ set(etm_usage_SRCS checkable2.cpp ) -kde4_add_executable(etm_usage ${etm_usage_SRCS}) +add_executable(etm_usage ${etm_usage_SRCS}) target_link_libraries(etm_usage ${KDE4_KDEUI_LIBS} diff --git a/kdepim/examples/kabc/CMakeLists.txt b/kdepim/examples/kabc/CMakeLists.txt index e3985fe4..f352e1f7 100644 --- a/kdepim/examples/kabc/CMakeLists.txt +++ b/kdepim/examples/kabc/CMakeLists.txt @@ -10,7 +10,7 @@ set(kabcviewer_bin_SRCS # todo: more appropriate icon? kde4_add_app_icon(kabcviewer_bin_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-address-book.png") -kde4_add_executable(kabcviewer_bin ${kabcviewer_bin_SRCS}) +add_executable(kabcviewer_bin ${kabcviewer_bin_SRCS}) set_target_properties(kabcviewer_bin PROPERTIES OUTPUT_NAME kabcviewer) target_link_libraries( kabcviewer_bin ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_CONTACT_LIBS} ${KDE4_KDEUI_LIBS} ) @@ -26,7 +26,7 @@ set(kabceditor_bin_SRCS # todo: more appropriate icon? kde4_add_app_icon(kabceditor_bin_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/office-address-book.png") -kde4_add_executable(kabceditor_bin ${kabceditor_bin_SRCS}) +add_executable(kabceditor_bin ${kabceditor_bin_SRCS}) set_target_properties(kabceditor_bin PROPERTIES OUTPUT_NAME kabceditor) target_link_libraries( kabceditor_bin ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_CONTACT_LIBS} ${KDE4_KDEUI_LIBS} ) diff --git a/kdepim/examples/mailreader/CMakeLists.txt b/kdepim/examples/mailreader/CMakeLists.txt index 27fd23df..a3bf4fab 100644 --- a/kdepim/examples/mailreader/CMakeLists.txt +++ b/kdepim/examples/mailreader/CMakeLists.txt @@ -18,7 +18,7 @@ kde4_add_ui_files(mailreader_SRCS mailreaderview.ui prefs_base.ui prefs_messagel kde4_add_kcfg_files(mailreader_SRCS settings.kcfgc) -kde4_add_executable(akonadimailreader ${mailreader_SRCS}) +add_executable(akonadimailreader ${mailreader_SRCS}) target_link_libraries(akonadimailreader ${KDE4_KDEUI_LIBS} diff --git a/kdepim/grantleeeditor/contactthemeeditor/CMakeLists.txt b/kdepim/grantleeeditor/contactthemeeditor/CMakeLists.txt index 447fc5eb..64e81524 100644 --- a/kdepim/grantleeeditor/contactthemeeditor/CMakeLists.txt +++ b/kdepim/grantleeeditor/contactthemeeditor/CMakeLists.txt @@ -29,7 +29,7 @@ set(contactthemeeditor_SRCS ) -kde4_add_executable(contactthemeeditor ${contactthemeeditor_SRCS} ) +add_executable(contactthemeeditor ${contactthemeeditor_SRCS} ) TARGET_LINK_LIBRARIES(contactthemeeditor ${KDEPIMLIBS_KMIME_LIBS} ${KDE4_KDEUI_LIBS} diff --git a/kdepim/grantleeeditor/grantleethemeeditor/CMakeLists.txt b/kdepim/grantleeeditor/grantleethemeeditor/CMakeLists.txt index a65d24a3..e8700567 100644 --- a/kdepim/grantleeeditor/grantleethemeeditor/CMakeLists.txt +++ b/kdepim/grantleeeditor/grantleethemeeditor/CMakeLists.txt @@ -25,12 +25,7 @@ kde4_add_kcfg_files(libgrantleethemeeditor_SRCS settings/globalsettings_base.kcfgc ) -kde4_add_ui_files(libgrantleethemeeditor_SRCS - ui/configurewidget.ui -) - - -kde4_add_library(grantleethemeeditor ${LIBRARY_TYPE} ${libgrantleethemeeditor_SRCS}) +add_library(grantleethemeeditor ${LIBRARY_TYPE} ${libgrantleethemeeditor_SRCS}) target_link_libraries(grantleethemeeditor ${QT_QTCORE_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} pimcommon ) diff --git a/kdepim/grantleeeditor/grantleethemeeditor/ui/configurewidget.ui b/kdepim/grantleeeditor/grantleethemeeditor/configurewidget.ui similarity index 100% rename from kdepim/grantleeeditor/grantleethemeeditor/ui/configurewidget.ui rename to kdepim/grantleeeditor/grantleethemeeditor/configurewidget.ui diff --git a/kdepim/grantleeeditor/headerthemeeditor/CMakeLists.txt b/kdepim/grantleeeditor/headerthemeeditor/CMakeLists.txt index b4179da4..359f4cdf 100644 --- a/kdepim/grantleeeditor/headerthemeeditor/CMakeLists.txt +++ b/kdepim/grantleeeditor/headerthemeeditor/CMakeLists.txt @@ -28,7 +28,7 @@ set(headerthemeeditor_SRCS ) -kde4_add_executable(headerthemeeditor ${headerthemeeditor_SRCS} ) +add_executable(headerthemeeditor ${headerthemeeditor_SRCS} ) TARGET_LINK_LIBRARIES(headerthemeeditor ${KDEPIMLIBS_KMIME_LIBS} ${KDE4_KDEUI_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} pimcommon messageviewer grantleethemeeditor) install(TARGETS headerthemeeditor ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/kdepim/grantleetheme/CMakeLists.txt b/kdepim/grantleetheme/CMakeLists.txt index 68635480..7edfc130 100644 --- a/kdepim/grantleetheme/CMakeLists.txt +++ b/kdepim/grantleetheme/CMakeLists.txt @@ -11,12 +11,10 @@ kde4_add_kcfg_files(libgrantleetheme_SRCS globalsettings_base.kcfgc ) -kde4_add_library(grantleetheme ${LIBRARY_TYPE} ${libgrantleetheme_SRCS}) +add_library(grantleetheme ${LIBRARY_TYPE} ${libgrantleetheme_SRCS}) target_link_libraries(grantleetheme ${QT_QTCORE_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ) set_target_properties(grantleetheme PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) install(TARGETS grantleetheme ${INSTALL_TARGETS_DEFAULT_ARGS}) - -add_subdirectory(kconf_update) diff --git a/kdepim/grantleetheme/kconf_update/CMakeLists.txt b/kdepim/grantleetheme/kconf_update/CMakeLists.txt deleted file mode 100644 index 5d100fba..00000000 --- a/kdepim/grantleetheme/kconf_update/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -install( FILES grantleetheme.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) diff --git a/kdepim/grantleetheme/kconf_update/grantleetheme.upd b/kdepim/grantleetheme/kconf_update/grantleetheme.upd deleted file mode 100644 index 6c024472..00000000 --- a/kdepim/grantleetheme/kconf_update/grantleetheme.upd +++ /dev/null @@ -1,4 +0,0 @@ -Id=initial-grantlee-theme-migration -File=kmail2rc,kmail2rc -Group=Reader,GrantleeTheme -Key=grantlee-theme-name,grantlee-theme-name diff --git a/kdepim/importwizard/CMakeLists.txt b/kdepim/importwizard/CMakeLists.txt index ebf8899a..836e5777 100644 --- a/kdepim/importwizard/CMakeLists.txt +++ b/kdepim/importwizard/CMakeLists.txt @@ -3,58 +3,58 @@ project(importwizard) add_subdirectory(icons) set(importwizard_SRCS -abstractbase.cpp -importwizardkernel.cpp -selectprogrampage.cpp -importaddressbookpage.cpp -importfilterpage.cpp -importmailpage.cpp -importsettingpage.cpp -importwizard.cpp -importfinishpage.cpp -main.cpp -abstractimporter.cpp -selectcomponentpage.cpp -importfilterinfogui.cpp -abstractsettings.cpp -abstractaddressbook.cpp -abstractcalendar.cpp -importcalendarpage.cpp -importwizardutil.cpp -thunderbird/thunderbirdimportdata.cpp -thunderbird/thunderbirdsettings.cpp -thunderbird/thunderbirdaddressbook.cpp -thunderbird/addressbook/MorkParser.cpp -sylpheed/sylpheedimportdata.cpp -sylpheed/sylpheedsettings.cpp -sylpheed/sylpheedaddressbook.cpp -sylpheed/sylpheedsettingsutils.cpp -evolutionv3/evolutionv3importdata.cpp -evolutionv3/evolutionsettings.cpp -evolutionv3/evolutioncalendar.cpp -evolutionv3/evolutionaddressbook.cpp -evolutionv3/evolutionutil.cpp -evolutionv2/evolutionv2importdata.cpp -evolutionv1/evolutionv1importdata.cpp -opera/operaimportdata.cpp -opera/operaaddressbook.cpp -opera/operasettings.cpp -oe/oeimportdata.cpp -mailapp/mailappimportdata.cpp -pmail/pmailimportdata.cpp -pmail/pmailsettings.cpp -thebat/thebatimportdata.cpp -balsa/balsaimportdata.cpp -balsa/balsasettings.cpp -balsa/balsaaddressbook.cpp -claws-mail/clawsmailimportdata.cpp -claws-mail/clawsmailsettings.cpp -claws-mail/clawsmailaddressbook.cpp -trojita/trojitasettings.cpp -trojita/trojitaimportdata.cpp -trojita/trojitaaddressbook.cpp -kmail1/kmail1importdata.cpp -kmail1/kmail1settings.cpp + abstractbase.cpp + importwizardkernel.cpp + selectprogrampage.cpp + importaddressbookpage.cpp + importfilterpage.cpp + importmailpage.cpp + importsettingpage.cpp + importwizard.cpp + importfinishpage.cpp + main.cpp + abstractimporter.cpp + selectcomponentpage.cpp + importfilterinfogui.cpp + abstractsettings.cpp + abstractaddressbook.cpp + abstractcalendar.cpp + importcalendarpage.cpp + importwizardutil.cpp + thunderbird/thunderbirdimportdata.cpp + thunderbird/thunderbirdsettings.cpp + thunderbird/thunderbirdaddressbook.cpp + thunderbird/addressbook/MorkParser.cpp + sylpheed/sylpheedimportdata.cpp + sylpheed/sylpheedsettings.cpp + sylpheed/sylpheedaddressbook.cpp + sylpheed/sylpheedsettingsutils.cpp + evolutionv3/evolutionv3importdata.cpp + evolutionv3/evolutionsettings.cpp + evolutionv3/evolutioncalendar.cpp + evolutionv3/evolutionaddressbook.cpp + evolutionv3/evolutionutil.cpp + evolutionv2/evolutionv2importdata.cpp + evolutionv1/evolutionv1importdata.cpp + opera/operaimportdata.cpp + opera/operaaddressbook.cpp + opera/operasettings.cpp + oe/oeimportdata.cpp + mailapp/mailappimportdata.cpp + pmail/pmailimportdata.cpp + pmail/pmailsettings.cpp + thebat/thebatimportdata.cpp + balsa/balsaimportdata.cpp + balsa/balsasettings.cpp + balsa/balsaaddressbook.cpp + claws-mail/clawsmailimportdata.cpp + claws-mail/clawsmailsettings.cpp + claws-mail/clawsmailaddressbook.cpp + trojita/trojitasettings.cpp + trojita/trojitaimportdata.cpp + trojita/trojitaaddressbook.cpp + kmail1/kmail1importdata.cpp + kmail1/kmail1settings.cpp ) include_directories(${CMAKE_SOURCE_DIR}/mailimporter @@ -68,19 +68,7 @@ include_directories(${CMAKE_SOURCE_DIR}/mailimporter set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) -kde4_add_ui_files(importwizard_SRCS - ui/selectprogrampage.ui - ui/importaddressbookpage.ui - ui/importfilterpage.ui - ui/importmailpage.ui - ui/importsettingpage.ui - ui/selectcomponentpage.ui - ui/importfinishpage.ui - ui/importcalendarpage.ui) - -kde4_add_app_icon(importwizard_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-kontact-import-wizard.png") - -kde4_add_executable(importwizard ${importwizard_SRCS}) +add_executable(importwizard ${importwizard_SRCS}) target_link_libraries(importwizard ${KDE4_KIO_LIBS} diff --git a/kdepim/importwizard/ui/importaddressbookpage.ui b/kdepim/importwizard/importaddressbookpage.ui similarity index 100% rename from kdepim/importwizard/ui/importaddressbookpage.ui rename to kdepim/importwizard/importaddressbookpage.ui diff --git a/kdepim/importwizard/ui/importcalendarpage.ui b/kdepim/importwizard/importcalendarpage.ui similarity index 100% rename from kdepim/importwizard/ui/importcalendarpage.ui rename to kdepim/importwizard/importcalendarpage.ui diff --git a/kdepim/importwizard/ui/importfilterpage.ui b/kdepim/importwizard/importfilterpage.ui similarity index 100% rename from kdepim/importwizard/ui/importfilterpage.ui rename to kdepim/importwizard/importfilterpage.ui diff --git a/kdepim/importwizard/ui/importfinishpage.ui b/kdepim/importwizard/importfinishpage.ui similarity index 100% rename from kdepim/importwizard/ui/importfinishpage.ui rename to kdepim/importwizard/importfinishpage.ui diff --git a/kdepim/importwizard/ui/importmailpage.ui b/kdepim/importwizard/importmailpage.ui similarity index 100% rename from kdepim/importwizard/ui/importmailpage.ui rename to kdepim/importwizard/importmailpage.ui diff --git a/kdepim/importwizard/ui/importsettingpage.ui b/kdepim/importwizard/importsettingpage.ui similarity index 100% rename from kdepim/importwizard/ui/importsettingpage.ui rename to kdepim/importwizard/importsettingpage.ui diff --git a/kdepim/importwizard/ui/selectcomponentpage.ui b/kdepim/importwizard/selectcomponentpage.ui similarity index 100% rename from kdepim/importwizard/ui/selectcomponentpage.ui rename to kdepim/importwizard/selectcomponentpage.ui diff --git a/kdepim/importwizard/ui/selectprogrampage.ui b/kdepim/importwizard/selectprogrampage.ui similarity index 100% rename from kdepim/importwizard/ui/selectprogrampage.ui rename to kdepim/importwizard/selectprogrampage.ui diff --git a/kdepim/incidenceeditor-ng/CMakeLists.txt b/kdepim/incidenceeditor-ng/CMakeLists.txt index aff6f930..1942343c 100644 --- a/kdepim/incidenceeditor-ng/CMakeLists.txt +++ b/kdepim/incidenceeditor-ng/CMakeLists.txt @@ -74,18 +74,7 @@ set(incidenceeditors_ng_desktop_LIB_SRCS visualfreebusywidget.cpp ) -kde4_add_ui_files(incidenceeditors_ng_desktop_LIB_SRCS - categoryeditdialog_base.ui - categoryselectdialog_base.ui - categorydialog_base.ui - template_management_dialog_base.ui - dialogdesktop.ui - alarmdialog.ui - attachmenteditdialog.ui - schedulingdialog.ui -) - -kde4_add_library(incidenceeditorsng ${LIBRARY_TYPE} ${incidenceeditors_ng_desktop_LIB_SRCS}) +add_library(incidenceeditorsng ${LIBRARY_TYPE} ${incidenceeditors_ng_desktop_LIB_SRCS}) target_link_libraries(incidenceeditorsng akonadi-calendar @@ -115,20 +104,7 @@ install(TARGETS incidenceeditorsng ${INSTALL_TARGETS_DEFAULT_ARGS}) ${incidenceeditors_ng_shared_LIB_SRCS} ) - kde4_add_ui_files(incidenceeditors_ng_mobile_LIB_SRCS - categoryeditdialog_base.ui - categoryselectdialog_base.ui - categorydialog_base.ui - editoralarms_base.ui - dialogdesktop.ui - dialogmobile.ui - dialogmoremobile.ui - attachmenteditdialog.ui - alarmdialog.ui - mobileschedulingdialog.ui - ) - - kde4_add_library(incidenceeditorsngmobile ${LIBRARY_TYPE} ${incidenceeditors_ng_mobile_LIB_SRCS}) + add_library(incidenceeditorsngmobile ${LIBRARY_TYPE} ${incidenceeditors_ng_mobile_LIB_SRCS}) target_link_libraries(incidenceeditorsngmobile akonadi-calendar @@ -156,7 +132,7 @@ install(TARGETS incidenceeditorsng ${INSTALL_TARGETS_DEFAULT_ARGS}) set(testincidenceeditor_SRCS main.cpp) -kde4_add_executable(kincidenceeditor ${testincidenceeditor_SRCS}) +add_executable(kincidenceeditor ${testincidenceeditor_SRCS}) target_link_libraries(kincidenceeditor akonadi-calendar @@ -171,4 +147,6 @@ target_link_libraries(kincidenceeditor install(TARGETS kincidenceeditor ${INSTALL_TARGETS_DEFAULT_ARGS}) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdepim/kaddressbook/CMakeLists.txt b/kdepim/kaddressbook/CMakeLists.txt index c834b51f..6a838356 100644 --- a/kdepim/kaddressbook/CMakeLists.txt +++ b/kdepim/kaddressbook/CMakeLists.txt @@ -27,7 +27,11 @@ endif() add_subdirectory(icons) add_subdirectory(printing) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) + add_subdirectory(merge/tests) + add_subdirectory(sendmail/tests) +endif() if(QGPGME_FOUND) add_definitions(-DQGPGME_FOUND) endif() @@ -54,12 +58,6 @@ set(kaddressbook_printing_SRCS printing/stylepage.cpp ) -kde4_add_ui_files(kaddressbook_printing_SRCS - printing/ringbinder/rbs_appearance.ui - printing/detailled/ds_appearance.ui - printing/compact/compactstyle.ui -) - set(kaddressbook_xxport_SRCS xxport/csv/csv_xxport.cpp xxport/csv/csvimportdialog.cpp @@ -115,7 +113,7 @@ set(kaddressbook_LIB_SRCS qt4_add_dbus_adaptor( kaddressbook_LIB_SRCS org.kde.kaddressbook.xml mainwidget.h MainWidget) kde4_add_kcfg_files(kaddressbook_LIB_SRCS settings/settings.kcfgc) -kde4_add_library(kaddressbookprivate ${LIBRARY_TYPE} ${kaddressbook_LIB_SRCS}) +add_library(kaddressbookprivate ${LIBRARY_TYPE} ${kaddressbook_LIB_SRCS}) target_link_libraries(kaddressbookprivate kdepim pimcommon @@ -131,8 +129,6 @@ target_link_libraries(kaddressbookprivate grantleetheme kleo ) -add_subdirectory(merge/tests) -add_subdirectory(sendmail/tests) if(QGPGME_FOUND) target_link_libraries(kaddressbookprivate ${QGPGME_LIBRARIES}) @@ -152,9 +148,7 @@ set(kaddressbook_SRCS mainwindow.cpp ) -kde4_add_app_icon(kaddressbook_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-kaddressbook.png") - -kde4_add_executable(kaddressbook ${kaddressbook_SRCS}) +add_executable(kaddressbook ${kaddressbook_SRCS}) target_link_libraries(kaddressbook ${KDEPIMLIBS_AKONADI_LIBS} diff --git a/kdepim/kaddressbookgrantlee/CMakeLists.txt b/kdepim/kaddressbookgrantlee/CMakeLists.txt index 25c77f23..3913e8a7 100644 --- a/kdepim/kaddressbookgrantlee/CMakeLists.txt +++ b/kdepim/kaddressbookgrantlee/CMakeLists.txt @@ -24,7 +24,7 @@ set(kaddressbook_grantlee_LIB_SRCS grantleeutil.cpp ) -kde4_add_library(kaddressbookgrantlee ${LIBRARY_TYPE} ${kaddressbook_grantlee_LIB_SRCS}) +add_library(kaddressbookgrantlee ${LIBRARY_TYPE} ${kaddressbook_grantlee_LIB_SRCS}) target_link_libraries(kaddressbookgrantlee ${Grantlee_CORE_LIBRARIES} grantleetheme diff --git a/kdepim/kalarm/CMakeLists.txt b/kdepim/kalarm/CMakeLists.txt index 717357da..5f466f12 100644 --- a/kdepim/kalarm/CMakeLists.txt +++ b/kdepim/kalarm/CMakeLists.txt @@ -174,10 +174,6 @@ set(kalarm_bin_SRCS ${kalarm_bin_SRCS} ) endif() -kde4_add_ui_files(kalarm_bin_SRCS - wakedlg.ui -) - qt4_add_dbus_adaptor(kalarm_bin_SRCS org.kde.kalarm.kalarm.xml dbushandler.h DBusHandler) if (KMAIL_SUPPORTED) qt4_add_dbus_interfaces(kalarm_bin_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml) @@ -198,11 +194,7 @@ endif() kde4_add_kcfg_files(kalarm_bin_SRCS GENERATE_MOC kalarmconfig.kcfgc) #if (UNIX) -kde4_add_app_icon(kalarm_bin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/appicons/ox*-app-kalarm.png") -kde4_add_executable(kalarm_bin ${kalarm_bin_SRCS}) -if(KALARM_USE_AKONADI) - add_dependencies(kalarm_bin kalarm_resource_xml kalarmdir_resource_xml) -endif() +add_executable(kalarm_bin ${kalarm_bin_SRCS}) if (KMAIL_SUPPORTED) add_dependencies(kalarm_bin kmail_xml) endif () @@ -265,8 +257,7 @@ install(PROGRAMS kalarm-version.pl kalarm-1.2.1-general.pl kalarm-1.9.5-defaults ########### KAuth helper ############### -kde4_add_executable(kalarm_helper rtcwakeaction.cpp) +add_executable(kalarm_helper rtcwakeaction.cpp) target_link_libraries(kalarm_helper ${KDE4_KDECORE_LIBS}) install(TARGETS kalarm_helper DESTINATION ${LIBEXEC_INSTALL_DIR}) kde4_install_auth_helper_files(kalarm_helper org.kde.kalarmrtcwake root) -kde4_install_auth_actions(org.kde.kalarmrtcwake rtcwakeaction.actions) diff --git a/kdepim/kalarm/Changelog b/kdepim/kalarm/Changelog deleted file mode 100644 index 6dea6242..00000000 --- a/kdepim/kalarm/Changelog +++ /dev/null @@ -1,1030 +0,0 @@ -KAlarm Change Log - -=== Version 2.10.12 --- 30 September 2014 === -- Make New Audio Alarm dialogue use sound file repeat preference setting. - -=== Version 2.10.11 (KDE 4.14.0) --- 12 August 2014 === -- [Akonadi] Fix alarms not being redisplayed after Akonadi server restarts - (requires kdepimlibs 4.14.0) [KDE Bug 336942] - -=== Version 2.10.10 (KDE 4.13.2) --- 10 May 2014 === -- [Akonadi] Fix no Defer button in alarm windows restored after login [KDE Bug 334334] -- Fix display of duplicate alarm windows after login. - -=== Version 2.10.9 (KDE 4.13.1) --- 4 May 2014 === -- [Akonadi] Fix no Defer button in alarm windows restored after crash [KDE Bug 334334] - -=== Version 2.10.8 (KDE 4.12.5) --- 18 April 2014 === -- [Akonadi] Fix wrong startup message about no writable active alarm calendar. -- [Akonadi] Fix setting Akonadi resource read-only making it unusable (requires kdepim-runtime 4.12.5) [KDE Bug 332889] - -=== Version 2.10.7 (KDE 4.12.4, 4.13.0) --- 21 March 2014 === -- [Akonadi] Fix deletion of alarm copies from KOrganiser not working. -- Fix crash after session restoration has nothing to restore [KDE Bug 331719] -- Prevent data in birthday import dialogue being editable. - -=== Version 2.10.6 (KDE 4.11.1) --- 27 August 2013 === -- [Akonadi] Fix error saving template when closing Edit Template dialogue [KDE Bug 323965] - -=== Version 2.10.5 (KDE 4.11.0) --- 3 August 2013 === -- Fix memory leak whenever the edit dialogue is closed. -- Fix auto-close alarms not displaying when KAlarm defaults to UTC time zone. -- Fix display alarm deferral limit when KAlarm defaults to UTC time zone. - -=== Version 2.10.4 (KDE 4.11 beta2) --- 15 June 2013 === -- Show startup warning if no writable active alarm calendar is enabled [KDE Bug 316338] - -=== Version 2.10.3 (KDE 4.10.5) --- 15 June 2013 === -- Fix sound repetition pause not working in audio alarms [KDE Bug 319261] -- Fix Stop Play button being left enabled after closing alarm window. - -=== Version 2.10.2 (KDE 4.10.4) --- 4 May 2013 === -- [Akonadi] Fix infinite loop on shutdown if display alarms are active [KDE Bug 317806] - -=== Version 2.10.1 (KDE 4.10.0) --- 10 December 2012 === -- [Akonadi] Fix memory leak when an alarm message window is displayed. -- [Akonadi] Fix memory leak on alarm edit. - -=== Version 2.10.0 (KDE 4.10 beta1)--- 13 November 2012 === -- Add --list command line option to list scheduled alarms to stdout. -- Add 'list' D-Bus command to return list of scheduled alarms. -- [Akonadi] Wait until calendars are populated before using them at startup. - -=== Version 2.9.3 (KDE 4.9.4) --- 13 November 2012 === -- [Akonadi] Fix alarm list not sorting new alarms when calendar is enabled [KDE Bug 306178] - -=== Version 2.9.2 (KDE 4.9.1) --- 22 August 2012 === -- Fix Quit not working in system tray icon context menu. -- [KResources] Fix KAlarm button not highlighting the alarm in the main window [KDE Bug 266082] - -=== Version 2.9.1 (KDE 4.9.0) --- 7 July 2012 === -- Add option to execute a pre-alarm action before deferred alarms. -- Provide options to auto-hide system tray icon when no alarms are due. -- Store KAlarm version and backend in config file. - -=== Version 2.8.6 (KDE 4.8.5) --- 14 July 2012 === -- [Akonadi] Don't display calendars which have no Akonadi resource. -- [Akonadi resources] Fix resource if config is missing. -- [Akonadi resources] Make resource work if location is set by path OR URL. -- Fix crash when closing alarm window for alarm which plays audio file. -- Fix "server did not accept the sender address" errors sending emails [KDE Bug 301946] - -=== Version 2.8.5 (KDE 4.8.4) --- 6 June 2012 === -- [Akonadi] Warn user and disable KAlarm if Akonadi fails to run [KDE Bug 300083] -- [Akonadi] Fix crash when saving new alarm [KDE Bug Bug 300376] - -=== Version 2.8.3 (KDE 4.8.3) --- 22 April 2012 === -- Store KAlarm version and backend in config file. -- Use the last selected sound file picker directory as the default next time. - -=== Version 2.8.2 (KDE 4.8.2) --- 29 March 2012 === -- [Akonadi] Fix error saving changed alarms when closing Edit Alarm dialogue. -- [Akonadi] Show old-format calendars in read-only colour in calendar list. -- [KResources] Fail cleanly if calendar resources fail to open [KDE Bug 296383] -- Prevent multiple email success messages after Try used in Edit Alarm dialogue. - -=== Version 2.8.1 (KDE 4.8.1) --- 19 February 2012 === -- [Akonadi] Don't give option to save new alarms in old format calendars. -- [Akonadi] Prevent duplicate prompts to update format of new calendar resource. -- [Akonadi] Automatically disable duplicated calendar resources [KDE Bug 293193] -- [Akonadi] Fix errors when creating default calendar resources [KDE Bug 293208] -- [Akonadi] Prevent multiple standard calendars for any alarm type. -- [Akonadi] Fix various crashes. -- Output cmake error if Akonadi option incompatible with kdepimlibs/kalarmcal. - -=== Version 2.8.0 (KDE 4.8.0) --- 16 January 2012 === -- Use Akonadi as the default calendar access method. -- Use configurable colours and KDE colour scheme for calendar list. -- Allow user to stop playback after clicking Try in audio alarm edit dialogue. - -=== Version 2.7.5 (KDE 4.7.4) --- 23 November 2011 === -- Fix crash due to audio thread not being correctly deleted. - -=== Version 2.7.4 (KDE 4.7.1) --- 28 August 2011 === -- Fix crash when last recurrence of late-cancel alarm triggers too late. -- Fix conversion of pre-version 1.4.14 subsidiary alarms. -- Fix new alarm not being scheduled after editing alarm from alarm window. -- Don't do search if invalid regular expression is entered in Find dialogue. -- Don't prevent interaction with alarm windows when a prompt or warning message - window is displayed [using KDE 4.7.1 or later]. -- Only reset visible tab in multi-tab settings sections when Defaults is clicked - in Configuration dialogue, and Current tab option is selected. -- Disable command output option for display alarms in edit alarm dialogue if - user not authorised to run shell commands. -- Always output "not authorised" error message if unauthorised user tries to run - shell commands. - -=== Version 2.7.3 --- 26 July 2011 === -- Fix crash when Wake From Suspend dialogue is shown with no alarm selected. - -=== Version 2.7.2 --- 15 July 2011 === -- Fix KAlarm not quitting when no visible windows or system tray icon remain. -- Cancel wake-from-suspend if alarm is disabled, or if all alarms are disabled. -- Various improvements and bug fixes to Wake From Suspend dialogue. -- In calendar list show calendar colours by text background, not coloured square. -- In alarm list show multi-line tooltip for alarm text when appropriate. - -=== Version 2.7.1 (KDE 4.7.0) --- 6 July 2011 === -- Make wake-from-suspend schedule a time-from-now, to make it work correctly - on systems whose hardware clock is out of sync with the system clock. -- Include Content-Transfer-Encoding header in emails to allow correct display. - -=== Version 2.7.0 --- 9 May 2011 === -- Add option to set a reminder AFTER the main alarm. -- Add option to wake computer from suspend when a selected alarm is triggered. -- Add command line option to disable alarm monitoring. -- Replace EMAILID, SPEAK, ERRCANCEL, ERRNOSHOW calendar properties with FLAGS - property parameters. - -=== Version 2.6.3 --- 27 April 2011 === -- Add option to not notify execution errors for pre-alarm actions. -- Set environment variable KALARM_UID to event UID for pre- & post-alarm actions. -- Warn user if only UTC time zone is available (if ktimezoned not installed). -- Don't reactivate start-at-login without prompting, after user switches it off, - except if KAlarm is session restored. -- Show error message and set read-only if location is blank for new resource. -- Fix crash on some systems when New Alarm dialogue is displayed from system tray - icon menu. -- Fix KAlarm button in alarm window not always showing main window and not - highlighting the alarm in the main window. -- Move New Alarm From Template action into New alarm menu to simplify toolbar. - -=== Version 2.4.11 (KDEPIM 4.4.11) --- 16 April 2011 === -- Fix bad borders round left hand buttons of time spinboxes in Oxygen style. -- Fix initialisation of library global statics. -- Ensure sound volume is not out of range when reading from calendar. -- Fix New Alarm dialogue from system tray menu restoring other windows. - -=== Version 2.4.10 (KDEPIM 4.4.8) --- 2 December 2010 === -- Fix KAlarm showing in system tray at login when configured not to show in tray. -- Fix working-time-only alarms not triggering if KAlarm is started up outside - working hours, after the last trigger time during working hours was missed. -- Don't quit if no window is visible when 'show in system tray' is deselected. -- Disable Defer button in new message window when deferral limit has been reached. -- Fix reminder time shown when editing a non-recurring alarm's deferred reminder. -- Fix conversion of pre-version 1.9.10 non-recurring alarms with simple repetition. -- Make disabled system tray icon more distinguishable for colour blind users. - -=== Version 2.4.9 (KDEPIM 4.4.7) --- 19 October 2010 === -- Fix crash if alarm triggers while its deletion confirmation prompt is visible. -- Fix crash when Try button is clicked while creating new display alarm. -- Fix crash on KAlarm exit. -- Fix possible crash when enabling individual alarms. -- Prevent long file name from expanding the width of file display alarm window. -- Allow pre- & post-alarm actions for alarms whose text is generated by a command. -- Combine 4 New Alarm icons in toolbar, to fix icon texts not fitting into width. - -=== Version 2.4.8 (KDEPIM 4.4.6) --- 4 September 2010 === -- Fix crash when a reminder alarm is being redisplayed. -- Fix possible crash: on alarm deletion, always update next alarm to trigger. -- Fix Sound File selection dialogue Play button not playing any sound. -- Always show current storage location choice in Configuration dialogue. -- Fix inability to leave file name blank in audio alarm templates. -- Fix changes to volume not enabling OK button when editing an audio alarm - template with no audio file specified. - -=== Version 2.4.7 (KDE 4.4.5) --- 3 June 2010 === -- Fix inability to defer non-recurring alarms. -- Fix crash when selecting calendar type in calendar selector, if text widths - and selector width are "exactly wrong". -- Fix loss of time zone specification for date only alarms when converting a - pre-2.3.2 calendar, if start-of-day time in calendar is not midnight. -- Enable alarm edit dialogue Time Zone button in read-only mode. - -=== Version 2.4.6 (KDE 4.4.4) --- 20 May 2010 === -- Fix alarm edit dialog not saving changes when invoked from alarm message - window's Edit button. -- Fix main window close action not working when system tray icon is not shown. - -=== Version 2.4.5 (KDE 4.4.3) --- 7 April 2010 === -- Fix audio files playing silently when no volume level has been specified. - -=== Version 2.4.4 (KDE 4.4.2) --- 17 March 2010 === -- Fix display alarm whose text is generated by a command and which has an audio - file, being converted into an audio-only alarm when reloaded. - -=== Version 2.4.3 (KDE 4.4.1) --- 21 February 2010 === -- Disable resource calendars which contain only wrong alarm types. - -=== Version 2.4.2 (KDE 4.4.0) --- 30 January 2010 === -- Fix non-ASCII text being corrupted in emails sent by KAlarm. -- Show error message if selected email identity has no email address. - -=== Version 2.4.1 (KDE 4.4.0 RC1) --- 8 December 2009 === -- Fix date-only recurring alarms triggering repeatedly at high frequency. - -=== Version 2.4.0 --- 24 November 2009 === -- New audio alarm option, without displaying alarm window. -- Add configuration setting for event duration for alarms copied to KOrganizer. -- Provide 'any time' option in Defer Alarm dialogue, for date-only alarms. -- Use KDE system settings to determine default working days in the week. -- Improve organisation of main menu. -- If dual screens, show alarm in other screen if any full screen window exists. -- Fix recurring date-only alarm triggering repeatedly and eating up CPU, if the - start-of-day time is after midnight and the alarm is due, but current UTC time - of day is earlier than the start-of-day time of day in the alarm's time zone. -- Update date-only alarm trigger times when user changes the start-of-day time. -- Don't write start-of-day time into calendar, to avoid clashes if it is shared. -- Don't waste processing time calculating next trigger time for archived alarms. -- Disable 'New Alarm from Template' action when no alarm templates exist. -- Interpret '~' (i.e. home directory) properly in entered file names. -- Fix crash if calendar formats are updated at login, during session restoration. -- Fix crash if editing alarm from alarm window Edit button, and window changes - from reminder to normal, or window changes from at-login to final at-login - trigger time, or window auto-closes. -- Prevent infinite loop if NEXTRECUR time in alarm is before alarm start time. -- Fix error saving the alarm after editing a repeat-at-login alarm. -- Don't set reminder/late-cancel/show-in-KOrganizer when saving repeat-at-login - alarms. -- Improve error feedback in sound file selection. -- Prevent sound file configuration dialogue closing after showing error message. - -=== Version 2.3.0 --- 10 July 2009 === -- Alarm edit: warn user if entered start time needs adjustment to fit recurrence. -- Command alarm edit: show error message if no command/script has been entered. -- Allow use of other command line options with --edit-new-* to initialise edit - dialogue options. -- Improve detection of conflicting command line options. - -=== Version 2.2.4 --- 23 June 2009 === -- Alarm edit: keep existing display file name if file select dialogue cancelled. -- Guard against crashes if KAlarm quits while a modal dialogue is open. -- Fix crash creating alarm from command line, if KAlarm not already running. -- Fix --reminder-once command line option being treated same as --reminder. - -=== Version 2.2.3 --- 14 June 2009 === -- Fix crash when more than one alarm with audio is displayed simultaneously. - -=== Version 2.2.2 --- 10 June 2009 === -- Fix email alarms sending multiple mails, when sent by KMail. -- Fix crash when closing remote calendars. - -=== Version 2.2.1 --- 25 May 2009 === -- Include new handbook translation: Ukrainian. - -=== Version 2.2.0 --- 29 April 2009 === -- Provide facility to export alarms to a new calendar file. -- Provide option to spread alarm and error messages over screen. -- Show command execution error indication for alarms in main window alarm list. -- Add configuration setting for default deferral time in Defer Alarm dialogue. -- Accept drag and drop of Todo entries to create a new alarm. - -=== Version 2.1.8 (KDE 4.2.4) --- 25 May 2009 === -- Fix crash on exit from birthday import dialogue. -- Fix crash when an alarm is open for edit when its last occurrence triggers, - and the edit is then saved. -- Fix another possible crash when KAlarm quits. -- Don't show time in alarm list for date-only alarms without time zone (e.g. - those created by Import Birthdays). - -=== Version 2.1.7 (KDE 4.2.3) --- 29 April 2009 === -- Fix recurring alarms being missed when deferred to earlier than next due alarm, - when next due alarm is earlier than the next recurrence. -- Fix crash at startup if a non-recurring cancel-if-late alarm has been missed. -- Fix speech mode not working when alarm messages are displayed. -- Fix KAlarm hanging sometimes while trying to play an audio file. -- Fix crash when KAlarm quits. -- Fix memory leak with undo/redo. - -=== Version 2.1.6 (KDE 4.2.2) --- 18 March 2009 === -- Fix memory leaks. -- Fix crash when KAlarm quits. - -=== Version 2.1.5 (KDE 4.2.1) --- 7 February 2009 === -- Disable inapplicable alarm types in alarm edit dialogue Load Template list. -- Prevent multiple identical error messages being displayed for the same alarm. -- Fix possible crash on alarm refresh, or removal or disabling of a resource. - -=== Version 2.1.4 (KDE 4.2) --- 18 January 2009 === -- Prevent corrupt alarms if deferral reinstates from archived alarm instead of - from the displaying calendar. -- Ignore events in calendar without usable alarms (which prevents them getting - stuck in the alarm list, and fixes high CPU usage). -- Show error message when New Template selected but no writable resource exists. -- Fix crash when iCalendar item is dragged and dropped onto KAlarm. -- Make New Alarm shortcuts work. -- Fix alarms not being saved if created by drag-and-drop but not edited further. - -=== Version 2.1.3 (KDE 4.2 RC1) --- 5 January 2009 === -- Fix invalid alarm remaining in calendar when pre-alarm action failure message - is acknowledged before the alarm is deferred. - -=== Version 2.1.2 --- 27 December 2008 === -- New KAlarm icon. -- Distinguish disabled from enabled alarm colour when highlighted in alarm list. -- Ensure alarm windows show on top of full-screen windows. -- Fix crash if KAlarm is activated again while restoring from previous session. -- Fix kalarmautostart crash on logout while kalarmautostart is still running. -- Fix click on system tray icon not showing main window if 'Show in system tray' - configuration setting deselected. - -=== Version 2.1.1 (KDE 4.2 beta2) --- 8 December 2008 === -- Allow global shortcuts for New Alarm actions. -- Fix failure to update alarms in KOrganizer when Kontact is running but - Kontact's calendar component is not loaded. -- Fix toolbar configuration being lost after quitting KAlarm. - -=== Version 2.1.0 (KDE 4.2 beta1) --- 13 November 2008 === -- Add option to exclude holidays from recurring alarms. -- Provide More/Less Options button in edit alarm dialogue. -- Improve Configuration dialogue layout, split pages into tabs. -- Show separate toolbar buttons for new display, command and email alarms. -- Show 'Time Zone' button instead of time zone selection controls when using - default time zone. -- Set file display alarm font & colour in same way as for text display alarms. -- Set default reminder time units according to how long until alarm is due. - -=== Version 2.0.6 (KDE 4.1.3) --- 22 October 2008 === -- Fix alarms not triggering correctly after laptop wakes from hibernation. -- Fix inability to change or cancel alarm deferral times. -- Prevent defer dialogue date being set outside the allowed range. -- Set background colour for file display alarm text. -- Don't wrap lines in file display alarm message windows. -- Fix addition and deletion of alarms to KOrganizer. - -=== Version 2.0.5 --- 27 September 2008 === -- Fix very high CPU usage by KAlarm when there are alarms with sub-repetitions, - or deferrals, with periods greater than 1 week. Fix requires kdepimlibs 4.1.3. - -=== Version 2.0.4 (KDE 4.1.2)--- 24 September 2008 === -- Add work-time-only parameter for D-Bus calls to create new alarms. - -=== Version 2.0.3 --- 7 September 2008 === -- Double click accepts selected template in pick list. -- Make text in edit alarm dialogue change colour when foreground colour changed. -- Replace colour combo boxes by buttons which display standard KDE colour picker. - -=== Version 2.0.2 (KDE 4.1.1) --- 27 August 2008 === -- Show alarm text entry fields in the current alarm message colours. -- Show background colour selector for file display alarms. -- Set KDE sound files directory as default for picking sound files. -- Fix width of buttons containing only an icon. -- Change Control Center references to System Settings. -- Fix formatting of file display alarms for non-HTML text files. -- Fix crash when birthday dialogue is opened more than once. -- Prevent quitting when main window is closed but system tray icon is visible. - -=== Version 2.0.2 --- 4 August 2008 === -- Set KDE sound files directory as default for picking sound files. -- Fix width of buttons containing only an icon. -- Change Control Center references to System Settings. - -=== Version 2.0.1 (KDE 4.1) --- 17 July 2008 === -- Double click in template dialogue list activates template edit dialogue. -- Fix KAlarm quitting on closing message window when no main window visible. -- Fix KAlarm crashing when quitting. - -=== Version 2.0.0 --- 7 July 2008 === -- New facility to use multiple alarm calendar resources. -- Add facility to select time zone for alarm times. -- Handle summer/winter time changes correctly. -- New option to trigger a recurring alarm only during working hours. -- Add option for display alarm text to be generated by a command. -- Provide "Don't show again for this alarm" option for command error messages. -- Alarm edit dialogue layout improvements. -- Make alarm edit and preferences dialogues scrollable if too high for screen. -- Choose new alarm/template type from menu instead of in alarm edit dialogue. -- Add option to show alarm windows in centre of screen, with buttons initially - disabled to prevent accidental acknowledgement. -- Remove alarm daemon (kalarmd) and do alarm monitoring in KAlarm itself. -- Remove --handleEvent command line option. -- Use custom properties instead of CATEGORIES in calendar events for KAlarm data. -- Don't discard non-KAlarm custom event properties when editing alarms. -- Use kconf_update to convert old config file settings. -- Change numeric codes in config file to strings for long-term maintainability. -- Rename Defaults section options in config file. -- Fix detection of yearly February 29th recurrences on Feb 28th or Mar 1st. - -=== Version 1.5.3 --- 16 June 2008 === -- In New From Template menu, show list of template names in sorted order. -- Fix recurrence count being lost when using alarm templates. -- Prevent invalid negative values appearing in 'Time from now' edit field. -- Fix time shown in alarm edit dialogue for recurring alarms. -- Fix recurrence count shown in alarm edit dialogue once alarm has triggered. -- Fix Find not working with a new search text after a failed search. -- Display correct error message when a search fails. -- Prevent user changing font/colour dialogue when editing read-only alarms. - -=== Version 1.5.2 --- 13 February 2008 === -- Prevent repetition duration error message when saving alarm which never -recurs. - -=== Version 1.5.1 (KDE 3.5.9) --- 13 February 2008 === -- Fix inability to set up sub-repetitions for simple yearly recurrences. - -=== Version 1.5.0 --- 23 January 2008 === -- Replace simple repetitions with recurrence sub-repetitions, to save confusion. -- Add option to enter reminder times in minutes, in addition to hours/minutes. -- Replace alarm edit dialogue background colour selector with font/colour sample. -- Store email unique IDs instead of names in email alarms to prevent problems if - email IDs are renamed. -- Fix error "Sender verify failed (in reply to RCPT TO command)" using sendmail - on some systems, by adding envelope sender address to emails. -- Fix OpenSolaris build error. - -=== Version 1.4.21 --- 19 December 2007 === -- Remember last used main window show/hide options instead of setting them in - Preferences dialogue. -- Make the Menu key work in the alarm list. -- Fix crash when saving preferences, if 'xterm' is not installed in the system. -- Prevent multiple identical error messages being displayed for the same alarm. - -=== Version 1.4.20 --- 18 November 2007 === -- Fix deferral of non-recurring alarms not working. -- Fix loss of reminder details in archive when alarm has had a reminder deferred. -- Fix inability to reactivate deleted alarms which still have repetitions to go. -- Fix incorrect interpretation of --late-cancel weekly parameter on command line. - -=== Version 1.4.19 --- 11 November 2007 === -- Fix KAlarm hanging and freezing the system for a while, especially on startup. -- Fix next occurrence time set after editing alarm, when it's a sub-repetition. -- Prevent error messages while typing date value, until user finishes entering it. - -=== Version 1.4.18 --- 2 November 2007 === -- Fix failure to trigger some recurring date-only alarms (e.g. after suspend-resume). -- Fix date-only alarms triggering every minute from midnight to start-of-day time. -- Simplify recurrence text shown in alarm edit dialogue Alarm tab when possible. -- Prevent error after browsing for command log file, due to file:// prefix. - -=== Version 1.4.17 (KDE 3.5.8) --- 8 October 2007 === -- Allow time-from-now values up to 999 hours to be entered. -- Fix incorrect email headers resulting in failure to send some emails. - -=== Version 1.4.16a --- 12 September 2007 === -- Fix failure to retrieve font and colour settings for display alarms. - -=== Version 1.4.16 --- 10 September 2007 === -- Attempt to fix failure to retrieve font and colour settings for display alarms. -- Disable reminder etc. controls for at-login recurrence in alarm edit dialogue. - -=== Version 1.4.15 --- 7 September 2007 === -- Fix deferrals of recurring alarms not triggering correctly. -- Fix failure to archive details of repetitions within a recurrence. -- Enable/disable "Show expired alarms" action when preferences change. - -=== Version 1.4.14 --- 5 August 2007 === -- Fix handling of exception dates in recurrences. -- In sound file dialogue change Play button to a Stop button while playing a file. - -=== Version 1.4.13 --- 18 May 2007 === -- Fix time value in templates not being stored. -- Expand time spin boxes to make room for all digits. -- Make Preferences dialogue non-modal. - -=== Version 1.4.12 (KDE 3.5.7) --- 11 May 2007 === -- Display advance reminders for each occurrence of recurring alarms. -- Fix Undo of deletion of active alarms. -- Disable simple repetition controls if repetitions can't fit between recurrences. -- Make the system tray tooltip take account of alarm repetitions. -- Show repetition & special action status by button states in alarm edit dialogue. -- Fix reminder alarms displaying very big numbers for how long until alarm is due. -- Fix KMail omitting attachments from email alarms (if KMail is the email client). - -=== Version 1.4.11 --- 16 April 2007 === -- Prevent pre-alarm actions being executed multiple times when alarm is triggered. -- Prevent alarm daemon triggering alarms multiple times. -- Only execute pre-alarm actions once (not for reminders or deferrals). -- Only execute post-alarm actions once when alarm is finally acknowledged (after - any deferrals), and not after reminders. -- Show file name as a tooltip on sound type combo box when "file" is selected. - -=== Version 1.4.10 --- 3 March 2007 === -- Add play button to sound file selection dialogue. -- Prevent simple repetitions triggering again when KAlarm is restarted. -- Fix recurring alarms being triggered on exception days. -- Fix start-of-day time being ignored for date-only alarms. -- Disable Defer button in new message window when deferral limit has been reached. -- Fix failure to save "Execute in terminal window" option in Preferences dialogue. -- Ensure up-to-date menus are displayed if user has a customised toolbar. - -=== Version 1.4.9 (KDE 3.5.6) --- 3 January 2007 === -- Minor changes. - -=== Version 1.4.8 --- 28 December 2006 === -- Fix Find always using first search text entered even after entering a new one. - -=== Version 1.4.7 --- 14 December 2006 === -- Fix crash saving Preferences dialogue (due to command alarm terminal setting). - -=== Version 1.4.6 --- 30 November 2006 === -- Fix crash if an alarm triggers while user is deleting it. -- Fix "Start alarm monitoring at login" value shown in preferences dialogue. -- Fix deselecting "Start alarm monitoring at login" when daemon not running. -- Fix editing of 29th February alarm options for non-leap years. -- Tidy up preferences dialogue Run mode options. -- Tidy up alarm edit/preferences dialogue sound type options into a combo box. -- Add context help for sound file fade options. - -=== Version 1.4.5 (KDE 3.5.5) --- 29 September 2006 === -- Improve alarm edit dialogue layout (Reminder controls moved to below Time box). - -=== Version 1.4.4 --- 11 July 2006 === -- Use an alarm's previous deferral time interval as default for its next deferral. - -=== Version 1.4.3 (KDE 3.5.4) --- 11 July 2006 === -- Add facility to import alarms from other calendar files. -- Fix Defer dialog time interval maximum to match maximum date/time value. -- Fix crash when a deferred expired recurring alarm is edited from message window. -- Fix crash when a message is redisplayed after login. -- Prevent inapplicable 'Unable to speak' error when alarm redisplayed after login. -- Save main window column order changes to use on restart (except message column). - -=== Version 1.3.10 (KDE 3.5.3) --- 22 May 2006 === -- Add DCOP calls and command line options to display the edit alarm dialogue. -- Add Select All and Deselect actions & shortcuts for import birthdays list. -- Make system tray icon appear in non-KDE window managers. -- Output error message if deleting copy of alarm from KOrganizer fails. -- Fix corruption of alarms displayed at logout and then deferred after login. -- Fix reminder time not being saved in alarm templates. -- Fix erroneous date adjustment of start of recurrence when saving alarm. -- Fix crash when --play command line option is used, if compiled without aRts. -- Don't show disabled alarms in system tray tooltip alarm list. - -=== Version 1.3.9 (KDE 3.5.2) --- 7 March 2006 === -- Notify daemon by DCOP that alarm has been processed: to prevent alarm loss, and - to prevent defunct kalarm processes when run mode is on-demand. -- Add Select All and Deselect actions & shortcuts for alarm and template lists. - -=== Version 1.3.8 --- 24 January 2006 === -- Fix kalarmd hang when triggering late alarm and KAlarm run mode is on-demand. - -=== Version 1.3.7 --- 22 January 2006 === -- Fix column widths when main window is resized, if columns have been reordered. - -=== Version 1.3.6 (KDE 3.5.1) --- 10 January 2006 === -- Make autoclose of message windows work. -- Fix New From Template not creating alarm if template contents are not changed. -- Ensure that day and month names translations are independent of locale calendar. -- Display alarm message windows within current screen in multi-head systems. -- Reduce size of Preferences dialog to fit in 1024x768 screen. - -=== Version 1.3.5 --- 14 December 2005 === -- Fix email attachments being forgotten when saving alarms. -- Fix toolbar configuration being lost after quitting KAlarm. - -=== Version 1.3.4 (KDE 3.5) --- 30 October 2005 === -- Fix incorrect recurrence frequency in Alarm Edit dialogue's Alarm tab. - -=== Version 1.3.3 --- 22 September 2005 === -- Add day-of-week selection to daily recurrence dialog. - -=== Version 1.3.2 (KDE 3.5 beta 1) --- 10 September 2005 === -- Add option to show alarms in KOrganizer's active calendar. -- Add option for email text alarms to locate the email in KMail. -- When email alarm triggers and KMail isn't running, start KMail and send mail - automatically instead of opening KMail composer window. -- Provide per-alarm option for yearly February 29th recurrences. -- Wait longer (20 seconds) before reporting alarm daemon registration failed. -- Minimise KMix window if KMix is started by KAlarm when displaying a message. -- Fix Plastik style 'enabled' indication for time spinbox left-hand buttons. -- Prevent message windows always being full screen after a big message is shown. -- Prevent message windows being initially larger than the desktop. -- Prevent message windows initially overlapping the KDE panel. -- Prevent session restoration displaying main windows which should be hidden. -- Fix alarms getting stuck if due during a daylight savings clock change. -- Change --volume command line option short form to -V (-v is used by --version). -- Fix reported shell errors when output from command alarm is discarded. -- Use 'KAlarm' untranslated in calendar product ID, to cater for locale changes. - -=== Version 1.3.1 --- 30 May 2005 === -- Add Undo/Redo facility for alarm edit/creation/deletion/reactivation. -- Add text search facility. -- Add option to speak alarm messages (if speech synthesis is installed). -- Add command line option --speak. -- Add 'New alarm from template' menu option and toolbar button. -- Add 'Time from now' option in alarm templates. -- Add fade option for playing sound files. -- Add option to log command alarm output to a file. -- Add Edit button to alarm message window to allow the alarm to be edited. -- Enable drag and drop of alarms to other applications. -- Email drag-and-drop from KMail (KDE >= 3.5) now presets alarm edit dialog with - full From/To/Cc/Subject headers and body text. - -=== Version 1.2.8 (KDE 3.4.1) --- 9 May 2005 === -- Fix failure to enable "Reminder for first recurrence only" checkbox. - -=== Version 1.2.7 --- 20 April 2005 === -- Use a sensible default for terminal window command in Preferences dialog. -- Validate terminal window command entered in Preferences dialog. -- Fix date range no longer being validated in Defer dialog. -- Don't ignore Sound setting in Preferences dialog Edit tab. -- Reset sound volume (if it was set) as soon as audio file playing is complete. -- Don't start KMix when an alarm is displayed if no sound volume is specified. -- Add command script and execute-in-terminal options to DCOP interface. - -=== Version 1.2.6 (KDE 3.4) --- 22 February 2005 === -- Pop up message windows far from cursor to avoid accidental acknowledgement. -- Start KMix if not already running, for setting alarm sound level. -- Fix alarms not triggering if IDs are duplicated in different calendar files. -- Improve validation when reading configuration file values. - -=== Version 1.2.5 (KDE 3.4 beta2) --- 21 January 2005 === -- Prevent multiple "Failed to start Alarm Daemon" error messages at startup. -- Fix missing left border for time spinboxes in Plastik style. - -=== Version 1.2.4 (KDE 3.4 beta1) --- 9 January 2005 === -- Provide option to enter a script for a command alarm, instead of a command line. -- Add option to run command alarms in terminal windows. -- Accept drag and drop of KAddressBook entries to alarm edit dialog email fields. -- Drag and drop now inserts text where appropriate, rather than replacing it. -- Display correct controls after loading a template in alarm edit dialog. - -=== Version 1.2.3 --- 7 December 2004 === -- Put alarm type icons in a separate, sortable, column in alarm list. -- Align times in alarm list. -- Fix crash when the last recurrence of an alarm is reached. -- Fix random limit on expired alarm discard time if stepping with spinbox buttons. -- Fix dialog layouts for right-to-left languages. -- Fix time spin box layout for right-to-left languages. - -=== Version 1.2.2 --- 27 November 2004 === -- Make alarm daemon (kalarmd) exclusive to KAlarm. -- Move control options for alarm daemon into KAlarm preferences dialog. -- Allow user to specify the late-cancellation period for an alarm. -- Add option to automatically close window after late-cancellation period. -- Add facility to enable and disable individual alarms. -- Add simple repetition facility, including repetition within a recurrence. -- Add option to pick a KMail identity to use as sender of email alarms. -- Add option to copy emails sent via sendmail, to KMail sent-mail folder. -- Show scheduled times, not reminder times, in alarm list and system tray tooltip. -- Make time edit controls use 12-hour clock when that is the user's default. -- Also fill in alarm edit dialog email fields when email is dropped onto KAlarm. -- New revised DCOP request interface (old interface still kept for compatibility). -- Make detection of email message display alarms independent of language. -- Use KMix whenever possible to set hardware sound volume. -- Limit range of entered date/time to valid values in deferral dialogue. -- Prevent kalarm failing to register with kalarmd except when really necessary. -- Fix time-to-alarm column in main window not always updating every minute. - -=== Version 1.1.7 (KDE 3.3.2) --- 27 November 2004 === -- Fix KAlarm button on message windows to make it always display main window. -- Show scheduled times, not reminder times, in alarm list and system tray tooltip. -- Fix time-to-alarm column in main window not always updating every minute. - -=== Version 1.1.6 (KDE 3.3.1) --- 30 September 2004 === -- Prevent crash, and output error message, if menu creation fails. -- Unsuppress Quit warning message box if default answer is Cancel quit. -- Prevent blind copy to self of email alarms via KMail when bcc is deselected. - -=== Version 1.1.5 --- 1 September 2004 === -- Show erroneous control in alarm edit dialog when an error message is displayed. -- Make alarm edit dialog always appear on current desktop. -- Make weekly/monthly/yearly recurrences scheduled from command line correspond - correctly to the start date. -- Fix start date for monthly/yearly recurrences scheduled from the command line. -- Fix DCOP triggerEvent() call to not reschedule alarm if it isn't due yet. - -=== Version 1.1.4 --- 21 August 2004 === -- Fix errors when altering or cancelling deferrals of expired recurrences. - -=== Version 1.1.3 (KDE 3.3) --- 28 July 2004 === -- Fix dialog sizing the first time KAlarm is run. - -=== Version 1.1.2 (KDE 3.3 beta2) --- 11 July 2004 === -- Fix hangup in interactions with alarm daemon introduced in version 1.1.1. -- Only tick Alarms Enabled menu items once alarms have actually been enabled. -- Fix build for "./configure --without-arts". - -=== Version 1.1.1 (KDE 3.3 beta1) --- 20 June 2004 === -- Output error message and disable alarms if can't register with alarm daemon. -- Exit if error in alarm calendar name configuration. -- Fix bug where sound file is selected even when Cancel is pressed. - -=== Version 1.1.0 --- 1 June 2004 === -- Add facility to define alarm templates. -- Add facility to specify pre- and post-alarm shell command actions. -- Add option to play sound file repeatedly until alarm window is closed. -- Add volume control for playing sound file. -- Add 'stop sound' button to alarm message window when sound file is played. -- Rename command line option --sound to --play, add option --play-repeat. -- Add command line option --volume. -- Add 'Configure Shortcuts' and 'Configure Toolbars' menu options in main window. -- After creating/editing alarm, prompt to re-enable alarms if currently disabled. -- Middle mouse button over system tray icon displays new alarm dialog. -- Add option to display a reminder once only before the first alarm recurrence. -- Display time-to-alarm in reminder message window. -- For message texts which are truncated in main window, show full text in tooltip. -- Allow time of day to be entered in format HHMM in time spin boxes. -- Allow hour to be omitted when colon format time is entered in time spin boxes. -- Add "Don't ask again" option to alarm deletion confirmation prompt. -- Prevent expired alarm calendar purges clashing with other alarm actions. -- Fix initial recurrence date/time for weekly/monthly/yearly recurrences. -- Fix yearly recurrences of the last day in the month. -- Disable yearly recurrence's month checkboxes depending on selected day of month. -- Update which time columns are displayed in alarm list when Preferences change. -- Don't store audio/reminder details in email/command alarms. -- Don't store email details in message/file/command alarms. -- Don't close message windows when quit is selected. -- Fix "Warn before quitting" configuration option. -- Don't redisplay error message windows on session restoration. -- Remove obsolete --displayEvent command line option (replaced by --triggerEvent). -- Remove obsolete pre-version 0.7 DCOP calls. - -=== Version 1.0.7 --- 2 May 2004 === -- Fix scheduleCommand() and scheduleEmail() DCOP handling. -- Make KAlarm build for "./configure --without-arts". -- Fix email body text not being saved in email alarms. -- Fix loss of --exec command line arguments. -- Remove wasted vertical space from message windows. - -=== Version 1.0.6 (KDE 3.2.2) --- 26 March 2004 === -- Make the Quit menu item in main window quit the program. -- Update time entry field after editing as soon as mouse cursor leaves it. -- Cancel deferral if reminder is set before it, to prevent it becoming stuck. -- Prevent undeleted recurring alarms being triggered immediately. -- Don't allow alarms to be undeleted if they are completely expired. - -=== Version 1.0.5 (KDE 3.2.1) --- 24 February 2004 === -- Fix whatsThis text on bottom row of alarm list. - -=== Version 1.0.4 --- 22 February 2004 === -- Fix freeze at login when multiple alarms trigger. -- Show all audio file types in sound file chooser dialogue. - -=== Version 1.0.3 --- 15 February 2004 === -- Prevent email alarms from being sent if no 'From' address is configured. -- Omit 'Bcc' when sending email alarms if no 'Bcc' address is configured. -- Fix freeze when starting the alarm daemon. -- Fix memory leaks displaying dialogs. -- Fix scheduleCommand() and scheduleEmail() DCOP handling. -- Fix errors saving expired alarm calendar. - -=== Version 1.0.2 (KDE 3.2) --- 29 January 2004 === -- Prevent editing alarm and saving without changes from deleting the alarm. - -=== Version 1.0.1 --- 4 January 2004 === -- Fix failure to see alarms if KAlarm is reactivated while restoring session. - -=== Version 1.0.0 --- 7 December 2003 === -- Allow entered start date for timed recurrence events to be earlier than now. -- Prevent attempted entry of recurrence end date earlier than start date or today. -- Fix error displaying time of expired repeat-at-login alarms. -- Fix memory leak when sending emails with attachments. -- Fix error trying to send emails with very small attachments. -- Eliminate duplicate reload-calendar calls to alarm daemon. - -=== Version 0.9.6 (KDE 3.2 beta1) --- 7 November 2003 === -- Add option to choose foreground colour for alarm messages. -- Create new alarm by dragging KMail email onto main window or system tray icon. -- Set initial recurrence defaults to correspond to alarm start date. -- Add option for how February 29th recurrences are handled in non-leap years. -- Monthly/yearly recurrence edit: adhere to user preference for start day of week. -- Eliminate multiple confirmation prompts when deleting multiple alarms. -- Eliminate duplicate alarms in system tray tooltip. -- Fix crash after reporting error opening calendar file. -- Fix wrong status in system tray icon if KAlarm starts up with alarms disabled. -- Fix wrong number of days in Time-to-alarm column in main window. -- Fix omission of deferred alarms from system tray tooltip. - -=== Version 0.9.5 --- 3 September 2003 === -- Add option for non-modal alarm message windows. -- Add option to display a notification when an email alarm queues an email. -- Emails via KMail are sent without opening composer window, if KMail is running. -- Provide separate configuration for 'From' and 'Bcc' addresses for email alarms. -- Add exceptions to recurrence specification. -- Add multiple month selection to yearly recurrence. -- Add day of month selection in yearly recurrence. -- Add last day of month option in monthly and yearly recurrences. -- Add 2nd - 5th last week of month options in monthly and yearly recurrences. -- Add filename completion to file and command alarm edit fields. -- Display alarms-disabled indication in system tray tooltip. -- Enable file alarms to display image files. -- Fix file alarms not dislaying some text files, and improve HTML file display. -- Fix loss of changes to attachment list after editing email alarms. -- Fix wrong recurrence end date being displayed when editing an existing alarm. - -=== Version 0.9.4 --- 3 July 2003 === -- Add time-to-alarm display option to main alarm list. -- Add option to list next 24 hours' alarms in system tray tooltip. -- Create new alarm by dragging text or URL onto main window or system tray icon. -- Display reasons for failure to send an email. -- Allow editing of the list of message colours. -- Edit new alarm by context menu or double click on white space in alarm list. -- Add show expired alarms option to preferences dialog. -- Display HTML files correctly in file display alarms. - -=== Version 0.9.3 --- 4 March 2003 === -- Add preferences option to set default sound file for the Edit Alarm dialog. -- Fix display of "Invalid date" message before Edit Alarm dialog displays. - -=== Version 0.9.2 --- 28 February 2003 === -- Option to set font for individual alarm messages. -- Allow multiple alarm selection in the main window. -- KAlarm icon in alarm message window selects the alarm in the main window. -- In Edit Alarm dialog, move all recurrence edit controls into Recurrence tab. -- Add quit warning message option to preferences dialog. -- Add "New Alarm" option to system tray context menu. -- Disallow command alarms when KDE is running in kiosk mode. -- Revised storage of beep, font, colour and program arguments in calendar file. -- Always save alarms in iCalendar format (but vCalendar may still be read). -- Add reminder, recurrence and font parameters to DCOP calls. -- Fix failure to enable alarms when running in on-demand mode. - -=== Version 0.9.1 --- 16 January 2003 === -- Add option to set advance reminders for display alarms. -- In run-in-system-tray mode, warn that alarms will be disabled before quitting. -- Fix monthly and yearly recurrences on nth Monday etc. of the month. -- Fix yearly recurrences on February 29th. -- Fix recurrence start times stored in expired calendar file. -- Fix extra empty events being stored in expired calendar file. - -=== Version 0.9.0 --- 3 January 2003 === -- Add facility to import birthdays from KAddressBook -- Add option to send an email instead of displaying an alarm message. -- Add option to store and view expired alarms. -- Add copy, view and undelete actions (as applicable) for the selected alarm. -- In alarm message window, message text can be copied to clipboard using mouse. -- Allow message text to be scrolled in alarm message window if too big to fit. -- Shift key with left mouse button steps time edit arrows by 5 minutes/6 hours. -- Report failure to run command alarm (bash, ksh shells only). -- Retain repeat-at-login status on alarm deferral. -- Restore alarm messages which were displayed before KAlarm was killed or crashed. -- Store alarm data in the calendar file in a more standard way. -- Alarm message defer dialog: update recurrence deferral time limit in real time. -- Weekly recurrence edit: adhere to user preference for start day of week. -- Use standard action icons. - -=== Version 0.8.5 (KDE 3.1.1) --- 21 February 2003 === -- Fix monthly and yearly recurrences on nth Monday etc. of the month. -- Fix yearly recurrences on February 29th. -- Fix failure to enable alarms when running in on-demand mode. - -=== Version 0.8.4 (KDE 3.1) --- 8 January 2003 === -- Make KAlarm icon in message window bring main window to current desktop. -- Fix detection of KDE desktop. -- Fix entry of yearly recurrences on a specified date in the year. - -=== Version 0.8.3 --- 9 November 2002 === -- Fix no system tray icon being displayed. -- Fix multiple system tray icons being displayed. -- Fix alarms being missed after changing "Disable alarms when not running" status. - -=== Version 0.8.2 --- 2 November 2002 === -- Fix audio files not playing. - -=== Version 0.8.1 --- 1 November 2002 === -- Adhere to KDE single/double click setting when clicking on alarm list. -- Fix possible loss of alarms if KAlarm has previously used another calendar file. -- Fix coordination between "At time" and "After time" values when they change. -- Always remove alarm deferral even when next recurrence triggers instead. -- When alarm triggers, replace any existing repeat-at-login alarm message window. -- Fix deselection of Sound not working after selecting a sound file. -- Fix display of hour spin buttons in time edit spin boxes. -- Prevent time edit spin box buttons from selecting the text. -- Clean up previous alarm list highlight properly when a new alarm is selected. -- Set sensible initial focus when edit alarm dialog pages are displayed. -- Fix Quit duplicate entry in system tray context menu. - -=== Version 0.8 (KDE 3.1 beta2) --- 16 September 2002 === -- Move recurrence edit to separate tab in alarm dialog (now fits 800x600 display). -- Add accelerator keys in dialogs. -- Provide date picker for entering dates. - -=== Version 0.7.5 --- 1 September 2002 === -- Add preferences options to choose default settings for the Edit Alarm dialog. -- Fix right-to-left character sets not being displayed in message edit control. -- Make "Help -> Report Bug" use the KDE bug system (bug #43250). -- Fix session restoration not occurring. - -=== Version 0.7.4 (KDE 3.1 beta1) --- 5 August 2002 === -- Add option to prompt for confirmation on alarm deletion. -- Add option to prompt for confirmation on alarm acknowedgement. -- Display KAlarm handbook Preferences section when Help clicked in config dialog. -- Correctly adjust wrong summer times stored by version 0.5.7 (KDE 3.0.0). - -=== Version 0.7.3 --- 24 July 2002 === -- Fix loss of alarm times after saving pre-version 0.7 calendar file. -- Fix main alarm list display of hours or hours/minutes repeat interval. -- Display KAlarm handbook when Help clicked in configuration dialog. - -=== Version 0.7.2 --- 2 July 2002 === -- Fix reading wrong alarm times from pre-version 0.7 calendar file. -- Partially fix loss of alarm times after saving pre-version 0.7 calendar file. - -=== Version 0.7.1 --- 29 June 2002 === -- Prevent duplicate message windows from being displayed. -- Make Close button on message window not the default button to reduce chance - of accidental acknowledgement. -- Fix non-ASCII message texts being saved as question marks. -- Fix memory leak with recurrences. - -=== Version 0.7.0 --- 15 June 2002 === -- Add option to play audio file when message is displayed. -- Add daily, weekly, monthly, annual recurrences. -- Allow deferring only up to next scheduled repetition time. -- Don't defer repetitions when an alarm is deferred. -- Make regular repetition and repeat-at-login mutually exclusive. -- Double click on alarm in main window opens alarm edit dialog. -- Change Reset Daemon menu option to Refresh Alarms. -- Save and restore window sizes. - -=== Version 0.6.4 --- 8 May 2002 === -- Make click on system tray icon always bring KAlarm to top on current desktop. -- Fix alarms not being triggered (depending on time zone). - -=== Version 0.6.0 --- 8 March 2002 === -- Add option to execute a command instead of displaying an alarm message. -- Add Try button to alarm message edit dialog. -- Add icons in the alarm list to indicate each alarm's type. -- Display error message if a file to be displayed is not a text file. -- Reduce chance of lost late-cancel alarms when daemon check interval is reduced. -- Rename command line option --displayEvent to --triggerEvent. -- Rename DCOP function displayMessage() to triggerEvent(). -- Rename DCOP function cancelMessage() to cancelEvent(). - -=== Version 0.5.8 (KDE 3.0.5A) --- 23 November 2002 === -- Fix detection of KDE desktop. - -=== Version 0.5.8 (KDE 3.0.5) --- 4 October 2002 === -- Fix possible loss of alarms if KAlarm has previously used another calendar file. - -=== Version 0.5.8 (KDE 3.0.4) --- 18 August 2002 === -- Make "Help -> Report Bug" use the KDE bug system (bug #43250). -- Fix right-to-left character sets not being displayed in message edit control. - -=== Version 0.5.8 (KDE 3.0.3) --- 5 August 2002 === -- Adjust wrong summer times stored by version 0.5.7 (KDE 3.0.0). -- Display KAlarm handbook when Help clicked in configuration dialog. -- Make Close button on message window not the default button to reduce chance - of accidental acknowledgement. -- Fix session restoration often not occurring at login. - -=== Version 0.5.7 (KDE 3.0.1) --- 9 May 2002 === -- Use local time for alarm times instead of using a time zone. -- Make click on system tray icon always bring KAlarm to top on current desktop. - -=== Version 0.5.7 (KDE 3.0) --- 17 March 2002 === -- Show system tray icon on deferring command line-initiated message (run-in- - system-tray mode). -- Associate main window with system tray icon when displayed from message window. -- Don't start KAlarm at login, until it has been run for the first time. -- Add startup notification to kalarm.desktop. -- Prevent open main window from cancelling KDE session shutdown. -- Fix failure to display messages after daemon is restarted (run-on-demand mode). -- Fix possible failure to display command line-initiated message. -- Fix crash in some circumstances on changing run mode to run-on-demand. -- Fix crash on clicking KAlarm icon in command line-initiated message window. -- Fix crash on deferring alarm in command line-initiated message window. -- Fix duplication of repeat-at-login alarms at login. -- Fix error displaying text file messages. - -=== Version 0.5.4 --- 7 February 2002 === -- Fix extra window being displayed in session restoration. - -=== Version 0.5.2 --- 31 January 2002 === -- Fix session restore crash if in 'run continuously in system tray' mode. - -=== Version 0.5.1 --- 30 January 2002 === -- Change configuration defaults. - -=== Version 0.5 --- 29 January 2002 === -- Incorporate system tray icon into KAlarm, add --tray option. -- Add 'run continuously in system tray' operating mode. -- Don't use alarm daemon GUI application. -- Add enable/disable alarms option to main window menu. -- Add show/hide system tray icon option to main window menu. -- Add toolbar. -- Rename alarm dialog Set Alarm button to OK. -- Rename message window OK button to Close. -- Remove keyboard accelerator for Reset Daemon. -- Fix magnified system tray icon. -- Include README, etc. files in installation. - -=== Version 0.4 --- 22 December 2001 === -- Modify to use split alarm daemon/alarm daemon GUI. -- Prevent a command line error exiting all open KAlarm windows. -- Ensure the program exits after starting with --stop or --reset options. - -=== Version 0.3.5 --- 5 December 2001 === -- Add option to repeat alarms at login. -- Add context help button to main window and message window. -- Fix occasional crash on displaying non-repeating alarms. -- Fix possible failure to display alarms at login. -- Fix blank title bar when main window restored at login. -- Fix alarms not deleted from main window when displayed at login. -- Fix handling of zero-length calendar file. -- Improve error messages. -- Make documentation files installation dependent on KDE version. - -=== Version 0.3.1 --- 20 November 2001 === -- Fix build fault when using ./configure --enable-final - -=== Version 0.3 --- 4 November 2001 === -- Add option to display a file's contents instead of specifying a message. -- Add dialog option to set an alarm's time as an interval from the current time. -- Add defer option to alarm message window. -- Provide button in alarm message window to activate KAlarm. -- Make dialogs modal only for their parent window. - -=== Version 0.2 --- 20 October 2001 === -- Implement repeating alarms. -- Add extra pair of arrow buttons to time spinbox to change the hour. -- Fix sorting by colour column. -- Better What's This? texts for the main window. -- Remove -r, -s short options (use --reset, --stop instead). - -=== Version 0.1.1 --- 1 September 2001 === -- Fix documentation not being created by build. - -=== Version 0.1 --- 31 August 2001 === -- Initial release. diff --git a/kdepim/kalarm/autostart/CMakeLists.txt b/kdepim/kalarm/autostart/CMakeLists.txt index 2c562d33..ee93f33e 100644 --- a/kdepim/kalarm/autostart/CMakeLists.txt +++ b/kdepim/kalarm/autostart/CMakeLists.txt @@ -6,9 +6,7 @@ set(kalarmautostart_SRCS autostart.cpp ) -kde4_add_app_icon(kalarmautostart_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../appicons/ox*-app-kalarm.png") - -kde4_add_executable(kalarmautostart ${kalarmautostart_SRCS}) +add_executable(kalarmautostart ${kalarmautostart_SRCS}) target_link_libraries(kalarmautostart ${KDE4_KDEUI_LIBS} ) diff --git a/kdepim/kalarm/resources/CMakeLists.txt b/kdepim/kalarm/resources/CMakeLists.txt index 63bdf0e5..3ed5a27b 100644 --- a/kdepim/kalarm/resources/CMakeLists.txt +++ b/kdepim/kalarm/resources/CMakeLists.txt @@ -12,7 +12,7 @@ set(kalarm_resources_LIB_SRCS ) -kde4_add_library(kalarm_resources ${LIBRARY_TYPE} ${kalarm_resources_LIB_SRCS}) +add_library(kalarm_resources ${LIBRARY_TYPE} ${kalarm_resources_LIB_SRCS}) target_link_libraries(kalarm_resources ${KDEPIMLIBS_KALARMCAL_LIBS} diff --git a/kdepim/kdgantt2/CMakeLists.txt b/kdepim/kdgantt2/CMakeLists.txt index d5057af4..d467fe5d 100644 --- a/kdepim/kdgantt2/CMakeLists.txt +++ b/kdepim/kdgantt2/CMakeLists.txt @@ -1,55 +1,30 @@ # Those paths need to be absolute since this file is included from other CMakeLists.txt files set(libkdgantt2_SRCS -kdganttabstractgrid.cpp -kdganttabstractrowcontroller.cpp -kdganttconstraint.cpp -kdganttconstraintgraphicsitem.cpp -kdganttconstraintmodel.cpp -kdganttconstraintproxy.cpp -kdganttdatetimegrid.cpp -kdganttforwardingproxymodel.cpp -kdganttglobal.cpp -kdganttgraphicsitem.cpp -kdganttgraphicsscene.cpp -kdganttgraphicsview.cpp -kdganttitemdelegate.cpp -kdganttlegend.cpp -kdganttlistviewrowcontroller.cpp -kdganttproxymodel.cpp -kdganttstyleoptionganttitem.cpp -kdganttsummaryhandlingproxymodel.cpp -kdgantttreeviewrowcontroller.cpp -kdganttview.cpp + kdganttabstractgrid.cpp + kdganttabstractrowcontroller.cpp + kdganttconstraint.cpp + kdganttconstraintgraphicsitem.cpp + kdganttconstraintmodel.cpp + kdganttconstraintproxy.cpp + kdganttdatetimegrid.cpp + kdganttforwardingproxymodel.cpp + kdganttglobal.cpp + kdganttgraphicsitem.cpp + kdganttgraphicsscene.cpp + kdganttgraphicsview.cpp + kdganttitemdelegate.cpp + kdganttlegend.cpp + kdganttlistviewrowcontroller.cpp + kdganttproxymodel.cpp + kdganttstyleoptionganttitem.cpp + kdganttsummaryhandlingproxymodel.cpp + kdgantttreeviewrowcontroller.cpp + kdganttview.cpp ) add_definitions(-DKDAB_NO_UNIT_TESTS -DKDGANTT_SHAREDLIB -DKDGANTT_BUILD_KDGANTT_LIB) -# Generate moc_foo.cpp files since that's what the cpp files include (it works automatically with qmake, this way...) -# List of source files generated with "grep -l moc_ *.cpp | sed -e 's/\.cpp$//'" -# Plus kdganttgraphicsview_p -set(libkdgantt_mocable_files - kdganttabstractgrid - kdganttconstraintmodel - kdganttconstraintproxy - kdganttdatetimegrid - kdganttforwardingproxymodel - kdganttgraphicsscene - kdganttgraphicsview - kdganttitemdelegate - kdganttproxymodel - kdganttsummaryhandlingproxymodel - kdganttview - kdganttlegend - kdgantttimescalezoomdialog -) -foreach(it ${libkdgantt_mocable_files}) - qt4_generate_moc(${it}.h ${CMAKE_BINARY_DIR}/kdgantt2/moc_${it}.cpp) - macro_add_file_dependencies(${it}.cpp ${CMAKE_BINARY_DIR}/kdgantt2/moc_${it}.cpp) -endforeach(it) - -qt4_generate_moc(kdganttgraphicsview_p.h ${CMAKE_BINARY_DIR}/kdgantt2/moc_kdganttgraphicsview_p.cpp) -macro_add_file_dependencies(kdganttgraphicsview.cpp ${CMAKE_BINARY_DIR}/kdgantt2/moc_kdganttgraphicsview_p.cpp) -kde4_add_library(kdgantt2 ${LIBRARY_TYPE} ${libkdgantt2_SRCS}) +add_library(kdgantt2 ${LIBRARY_TYPE} ${libkdgantt2_SRCS}) target_link_libraries(kdgantt2 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ) set_target_properties( kdgantt2 PROPERTIES VERSION 0.1.0 SOVERSION 0) diff --git a/kdepim/kjots/ANNOUNCE b/kdepim/kjots/ANNOUNCE deleted file mode 100644 index fa62afe9..00000000 --- a/kdepim/kjots/ANNOUNCE +++ /dev/null @@ -1,28 +0,0 @@ -(This file is being kept for historical reasons only.) - -kjots (version 0.3.0) - a note taker ------------------------------------- - -Hi ! - -New versions of kjots go directly into the kdeutils distribution. -This is for version 0.3.0. - -What is kjots -------------- - -Name and idea for this program are taken from the jots program included -in the tkgoodstuff package by Mark Crimmins (markcrim@umich.edu). - -Kjots helps you to write down some notes and maybe reduces the stack of -paper lying on your desk. - -New in this version -------------------- - -- added lots of keyboard shortcuts - - -Regards. - - Chris. diff --git a/kdepim/kjots/CHANGES b/kdepim/kjots/CHANGES deleted file mode 100644 index dd2aa0b4..00000000 --- a/kdepim/kjots/CHANGES +++ /dev/null @@ -1,117 +0,0 @@ -4.0 (Jaison Lee ) -- Port to KDE4/Qt4 -- Refactored LOTS of code. -- Use delayed initialization tricks to make startup snappier. -- (FEATURE: 120025) Save bookshelf order in between program invocations. -- (FEATURE: 40854) Now available: Bold, Underline, Italic, and Strike-Out -- (FEATURE: 74677) Multiple entries can be selected in the bookshelf. -- Detect if there are duplicate IDs to prevent runtime problems. -- (FEATURE: 74647) Links to other KJots pages can be embedded in an entry. -- (FEATURE: 66826) Dropped URLs are clickable, and you can make new URLs, too. -- Refactored find/replace system. KJots now supports every find and replace option - generally available, including regular expressions and placeholders. And you - can even tell it to recursively search/replace through all the pages. - (BUG: 109621) Find doesn't work in bookshelf - (FEATURE: 124006) Global search all pages -- (FEATURE: 59032) You can now change the background color of books in the bookshelf. -- FEATURE: Added support for fonts. -- (FEATURE: 75070) Added ability to Export and Import a book. -- BUG/FEATURE: Added "dontAskAgain" functionality to several dialogs. -- (FEATURE: 74676) Prompt for title of new pages if the user wishes. - -0.6 / 0.7 (Jaison Lee ) -- (BUG:105501) Recent changes show up when printing. -- Autosave works now. -- Massive code cleanup/restructure. -- (BUG: 106059) Fix data loss after drag. -- (BUG: 78403) Display collapsed books correctly. -- (BUG: 94290) Book renames are now displayed immediately in the book overview. -- (BUG: 78403) Allow for Unicode. -- Books are now saved in XML, for easier addition of new features. -- (BUG: 79960) Save books with unique filename. -- Bookmarks work better. -- (FEATURE: 74642) At long last! Books can be nested to any level! Enjoy. -- (FEATURE: 80719) The cursor position will be remembered while the program is running. -- (BUG: 109198) Prevent misbehaviour when there is nothing in the QListView. -- (BUG: 109299) Fix race condition. -- (BUG: 109303) Act better when no books available. -- (BUG: 109371) Correct menu behaviour. -- (BUG: 109372) Disable renaming and moving during invalid page moves. -- (BUG: 109580) The next/prev book/page functions will no longer loop forever. -- (BUG: 109583) Fixed a minor regression that was causing the Edit->Cut menu option -to display incorrectly. - -new in version 0.5 (Aaron J. Seigo) -- redesign of UI -- use of XMLGUI -- simplification of internals -- insertion of date and time -- printing -- stability improvements -- made KUniqueApp - -(Carsten Pfeiffer ) -- use KEdit instead of QMultiLineEdit directly - -> gains Search & replace + undo -- allocate KTMainWindow on the heap to avoid double deletion on quit - -new in version 0.4 (Mario Weilguni ) -- works now with Qt 2.0 -- fixed broken layout of main window -- layout improvements in AskFileName() -- layout improvements in SubjList() -- compiles without warnings -- "Apply" button is only activated when changes were made -- improved layout of configuration dialog -- fixed a bug in the font selection - -- now compiles with EGCS ( Robert Williams ) - -new in version 0.3.0 -- added lots of keyboard shortcuts -- added klocale->translate() - -new in version 0.2.6 -- icons should be visible in the toolbar - -new in version 0.2.5 -- you may save books and pages to an ascii file -- more kde conforming due to the use of KTopLevelWidget - -new in version 0.2.4 -- uses kfontdialog to set the font of the editor widget -- you may select an URL in your text and press the right mouse button - to execute a program with this URL. The program to execute is - configurable for http and ftp URLs. -- some code cleanup - -new in version 0.2.3 -- compiles with libkde-970510 NOTE: this version is needed ! -- shouldn't segfault, if you delete pages -- double clicking on an entry in the subjectlist closes the subjectlist window -- fixed fonds -> fonts ;) - -new in version 0.2.2 -- compiles with libkde-0.7.2 -- several bug fixes - -new in version 0.2.1 - -- should compile cleanly with libqt1.2 and libkde-0.7.1 and later - -new in version 0.2.0 - -- changed the layout to be more KDE conforming (toolbar, statusbar,...) -- folders are now called books and entries are pages -- added subject to each page -- you may popup a window with a list of all subjects and use it to find - pages more easily -- further reduced the minimum size of the window - -new in version 0.1.1 - -- does not delete empty lines anymore -- you may insert TABs into your text -- the minimum size of the window is smaller now -- the size of the window is saved and read the next - time kjots is started diff --git a/kdepim/kjots/CMakeLists.txt b/kdepim/kjots/CMakeLists.txt index 75a864f4..d6ca77b8 100644 --- a/kdepim/kjots/CMakeLists.txt +++ b/kdepim/kjots/CMakeLists.txt @@ -29,9 +29,6 @@ set(kjots_config_SRCS kjotsconfigdlg.cpp) kde4_add_kcfg_files(kjots_config_SRCS KJotsSettings.kcfgc ) -kde4_add_ui_files(kjots_config_SRCS confpagemisc.ui) - - set (kjots_common_SRCS aboutdata.cpp kjotslockjob.cpp @@ -67,9 +64,8 @@ set(kjots_SRCS KJotsMain.cpp ${kjots_common_SRCS} ) -kde4_add_app_icon(kjots_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-kjots.png") -kde4_add_executable(kjots ${kjots_SRCS}) +add_executable(kjots ${kjots_SRCS}) target_link_libraries(kjots ${kjotsLibs} diff --git a/kdepim/kjots/plasmoid/CMakeLists.txt b/kdepim/kjots/plasmoid/CMakeLists.txt index f017092a..2b313e7e 100644 --- a/kdepim/kjots/plasmoid/CMakeLists.txt +++ b/kdepim/kjots/plasmoid/CMakeLists.txt @@ -12,8 +12,6 @@ set(akonotes_noteslist_plasmoid_SRCS plasmatreeview.cpp ) -kde4_add_ui_files(akonotes_noteslist_plasmoid_SRCS akonotes_applet.ui ) - kde4_add_plugin(plasma_applet_akonotes_note ${akonotes_note_plasmoid_SRCS}) kde4_add_plugin(plasma_applet_akonotes_list ${akonotes_noteslist_plasmoid_SRCS}) diff --git a/kdepim/kleopatra/CMakeLists.txt b/kdepim/kleopatra/CMakeLists.txt index c7e43d59..2488beaa 100644 --- a/kdepim/kleopatra/CMakeLists.txt +++ b/kdepim/kleopatra/CMakeLists.txt @@ -70,14 +70,8 @@ endif() add_subdirectory(kgpgconf) add_subdirectory(kwatchgnupg) -add_subdirectory(tests) - -if(WIN32) - set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_win.cpp) - set(_kleopatra_extra_SRCS utils/gnupg-registry.c selftest/registrycheck.cpp) -else() - set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_unix.cpp) - set(_kleopatra_extra_SRCS) +if(ENABLE_TESTING) + add_subdirectory(tests) endif() if(USABLE_ASSUAN_FOUND) @@ -85,7 +79,7 @@ if(USABLE_ASSUAN_FOUND) set(_kleopatra_uiserver_SRCS uiserver/sessiondata.cpp uiserver/uiserver.cpp - ${_kleopatra_extra_uiserver_SRCS} + uiserver/uiserver_unix.cpp uiserver/assuanserverconnection.cpp uiserver/echocommand.cpp uiserver/decryptverifycommandemailbase.cpp @@ -103,15 +97,6 @@ if(USABLE_ASSUAN_FOUND) libkleopatraclient/core/command.cpp selftest/uiservercheck.cpp ) - set_source_files_properties(libkleopatraclient/core/command.cpp PROPERTIES SKIP_AUTOMOC TRUE) - - qt4_generate_moc(libkleopatraclient/core/command_p.h "${CMAKE_CURRENT_BINARY_DIR}/libkleopatraclient/core/moc_command_p.cpp") - qt4_generate_moc(libkleopatraclient/core/command.h "${CMAKE_CURRENT_BINARY_DIR}/libkleopatraclient/core/moc_command.cpp") - - list(APPEND _kleopatra_uiserver_SRCS - "${CMAKE_CURRENT_BINARY_DIR}/libkleopatraclient/core/moc_command_p.cpp" - "${CMAKE_CURRENT_BINARY_DIR}/libkleopatraclient/core/moc_command.cpp" - ) if(ASSUAN2_FOUND) set(_kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES}) @@ -133,8 +118,6 @@ else() set(_kleopatra_uiserver_SRCS) endif() -kde4_add_ui_files(_kleopatra_uiserver_SRCS crypto/gui/signingcertificateselectionwidget.ui) - set(_kleopatra_SRCS utils/gnupg-helper.cpp utils/filesystemwatcher.cpp @@ -171,8 +154,6 @@ set(_kleopatra_SRCS selftest/gpgagentcheck.cpp selftest/libkleopatrarccheck.cpp - ${_kleopatra_extra_SRCS} - models/keycache.cpp models/keylistmodel.cpp models/keylistsortfilterproxymodel.cpp @@ -307,26 +288,6 @@ if(KLEO_MODEL_TEST) set(_kleopatra_SRCS ${_kleopatra_SRCS} models/modeltest.cpp) endif() -kde4_add_ui_files(_kleopatra_SRCS - dialogs/certificationoptionswidget.ui - dialogs/expirydialog.ui - dialogs/lookupcertificatesdialog.ui - dialogs/ownertrustdialog.ui - dialogs/selectchecklevelwidget.ui - dialogs/selftestdialog.ui - dialogs/exportsecretkeydialog.ui - dialogs/adduseriddialog.ui - dialogs/certificatedetailsdialog.ui - dialogs/setinitialpindialog.ui - newcertificatewizard/listwidget.ui - newcertificatewizard/chooseprotocolpage.ui - newcertificatewizard/enterdetailspage.ui - newcertificatewizard/overviewpage.ui - newcertificatewizard/keycreationpage.ui - newcertificatewizard/resultpage.ui - newcertificatewizard/advancedsettingsdialog.ui -) - kde4_add_kcfg_files(_kleopatra_SRCS kcfg/tooltippreferences.kcfgc kcfg/emailoperationspreferences.kcfgc @@ -358,9 +319,7 @@ endif() add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5151) -kde4_add_app_icon(_kleopatra_mainwindow_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-kleopatra.png") - -kde4_add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS}) +add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS}) set_target_properties(kleopatra_bin PROPERTIES OUTPUT_NAME kleopatra) target_link_libraries(kleopatra_bin @@ -374,10 +333,6 @@ target_link_libraries(kleopatra_bin ${_kleopatra_libkdepim_LIBS} ) -if(KDEPIM_MOBILE_UI) - target_link_libraries(kleopatra_bin ${QT_QTDECLARATIVE_LIBRARY}) -endif() - if(USABLE_ASSUAN_FOUND) target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY}) endif() diff --git a/kdepim/kleopatra/conf/CMakeLists.txt b/kdepim/kleopatra/conf/CMakeLists.txt index aa155425..1444209c 100644 --- a/kdepim/kleopatra/conf/CMakeLists.txt +++ b/kdepim/kleopatra/conf/CMakeLists.txt @@ -16,11 +16,6 @@ if(BUILD_libkleopatraclient) cryptooperationsconfigpage.cpp ) - kde4_add_ui_files(_kcm_kleopatra_libkleopatraclient_extra_SRCS - smimevalidationconfigurationwidget.ui - cryptooperationsconfigwidget.ui - ) - kde4_add_kcfg_files(_kcm_kleopatra_libkleopatraclient_extra_SRCS ${CMAKE_SOURCE_DIR}/kleopatra/kcfg/smimevalidationpreferences.kcfgc ) @@ -51,11 +46,6 @@ set(kcm_kleopatra_PART_SRCS add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5152) -kde4_add_ui_files(kcm_kleopatra_PART_SRCS - appearanceconfigwidget.ui - smimevalidationconfigurationwidget.ui -) - kde4_add_kcfg_files(kcm_kleopatra_PART_SRCS ${CMAKE_SOURCE_DIR}/kleopatra/kcfg/tooltippreferences.kcfgc ${CMAKE_SOURCE_DIR}/kleopatra/kcfg/emailoperationspreferences.kcfgc diff --git a/kdepim/kleopatra/kgpgconf/CMakeLists.txt b/kdepim/kleopatra/kgpgconf/CMakeLists.txt index fea0a5a6..e34db8a8 100644 --- a/kdepim/kleopatra/kgpgconf/CMakeLists.txt +++ b/kdepim/kleopatra/kgpgconf/CMakeLists.txt @@ -14,12 +14,7 @@ set(_kgpgconf_SRCS mainwindow.cpp ) -kde4_add_ui_files(_kgpgconf_SRCS mainwidget.ui) - -# todo: more appropriate icon? -kde4_add_app_icon(_kgpgconf_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/preferences-desktop-cryptography.png") - -kde4_add_executable(kgpgconf ${_kgpgconf_SRCS}) +add_executable(kgpgconf ${_kgpgconf_SRCS}) target_link_libraries(kgpgconf ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS}) diff --git a/kdepim/kleopatra/kwatchgnupg/CMakeLists.txt b/kdepim/kleopatra/kwatchgnupg/CMakeLists.txt index 143c22e5..eb8a9223 100644 --- a/kdepim/kleopatra/kwatchgnupg/CMakeLists.txt +++ b/kdepim/kleopatra/kwatchgnupg/CMakeLists.txt @@ -9,13 +9,9 @@ set(kwatchgnupg_SRCS main.cpp ) -if(WIN32) - set(kwatchgnupg_SRCS ${kwatchgnupg_SRCS} ../utils/gnupg-registry.c) -endif() - include_directories(..) -kde4_add_executable(kwatchgnupg ${kwatchgnupg_SRCS}) +add_executable(kwatchgnupg ${kwatchgnupg_SRCS}) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5153) diff --git a/kdepim/kleopatra/libkleopatraclient/CMakeLists.txt b/kdepim/kleopatra/libkleopatraclient/CMakeLists.txt index 17b4980b..8507e51a 100644 --- a/kdepim/kleopatra/libkleopatraclient/CMakeLists.txt +++ b/kdepim/kleopatra/libkleopatraclient/CMakeLists.txt @@ -4,5 +4,7 @@ set(libkleopatraclient_soversion "0") add_subdirectory(core) add_subdirectory(gui) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdepim/kleopatra/libkleopatraclient/core/CMakeLists.txt b/kdepim/kleopatra/libkleopatraclient/core/CMakeLists.txt index d4f1ea28..f509e79d 100644 --- a/kdepim/kleopatra/libkleopatraclient/core/CMakeLists.txt +++ b/kdepim/kleopatra/libkleopatraclient/core/CMakeLists.txt @@ -9,24 +9,12 @@ add_definitions( -DQT_NO_CAST_FROM_ASCII -DQT_NO_KEYWORDS -DQT_NO_CAST_TO_ASCII ) -if(WIN32) - set(_kleopatraclientcore_extra_SRCS ../../utils/gnupg-registry.c) -else() - set(_kleopatraclientcore_extra_SRCS) -endif() - -set_source_files_properties(command.cpp PROPERTIES SKIP_AUTOMOC TRUE) -qt4_generate_moc(command_p.h "${CMAKE_CURRENT_BINARY_DIR}/moc_command_p.cpp") -qt4_generate_moc(command.h "${CMAKE_CURRENT_BINARY_DIR}/moc_command.cpp") -kde4_add_library(kleopatraclientcore ${LIBRARY_TYPE} - ${_kleopatraclientcore_extra_SRCS} +add_library(kleopatraclientcore ${LIBRARY_TYPE} initialization.cpp command.cpp selectcertificatecommand.cpp signencryptfilescommand.cpp decryptverifyfilescommand.cpp - "${CMAKE_CURRENT_BINARY_DIR}/moc_command_p.cpp" - "${CMAKE_CURRENT_BINARY_DIR}/moc_command.cpp" ) set_target_properties(kleopatraclientcore PROPERTIES @@ -34,32 +22,16 @@ set_target_properties(kleopatraclientcore PROPERTIES SOVERSION ${libkleopatraclient_soversion} ) -if(WIN32) - if(ASSUAN2_FOUND) - target_link_libraries(kleopatraclientcore - ${QT_QTCORE_LIBRARY} - ${ASSUAN2_LIBRARIES} - ws2_32 - ) - else() - target_link_libraries(kleopatraclientcore - ${QT_QTCORE_LIBRARY} - ${ASSUAN_VANILLA_LIBRARIES} - ws2_32 - ) - endif() +if(ASSUAN2_FOUND) +target_link_libraries(kleopatraclientcore + ${QT_QTCORE_LIBRARY} + ${ASSUAN2_LIBRARIES} +) else() - if(ASSUAN2_FOUND) - target_link_libraries(kleopatraclientcore - ${QT_QTCORE_LIBRARY} - ${ASSUAN2_LIBRARIES} - ) - else() - target_link_libraries(kleopatraclientcore - ${QT_QTCORE_LIBRARY} - ${ASSUAN_PTHREAD_LIBRARIES} - ) - endif() +target_link_libraries(kleopatraclientcore + ${QT_QTCORE_LIBRARY} + ${ASSUAN_PTHREAD_LIBRARIES} +) endif() install(TARGETS kleopatraclientcore ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/kdepim/kleopatra/libkleopatraclient/gui/CMakeLists.txt b/kdepim/kleopatra/libkleopatraclient/gui/CMakeLists.txt index 3c5bab2a..78355c71 100644 --- a/kdepim/kleopatra/libkleopatraclient/gui/CMakeLists.txt +++ b/kdepim/kleopatra/libkleopatraclient/gui/CMakeLists.txt @@ -2,7 +2,7 @@ include_directories(${CMAKE_SOURCE_DIR}/kleopatra) add_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_KEYWORDS -DQT_NO_CAST_TO_ASCII) -kde4_add_library(kleopatraclientgui ${LIBRARY_TYPE} certificaterequester.cpp) +add_library(kleopatraclientgui ${LIBRARY_TYPE} certificaterequester.cpp) target_link_libraries(kleopatraclientgui ${QT_QTGUI_LIBRARY} diff --git a/kdepim/kleopatra/selftest/registrycheck.cpp b/kdepim/kleopatra/selftest/registrycheck.cpp deleted file mode 100644 index 7af7ade3..00000000 --- a/kdepim/kleopatra/selftest/registrycheck.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/* -*- mode: c++; c-basic-offset:4 -*- - selftest/registrycheck.cpp - - This file is part of Kleopatra, the KDE keymanager - Copyright (c) 2008 Klarälvdalens Datakonsult AB - - Kleopatra 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. - - Kleopatra 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; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - In addition, as a special exception, the copyright holders give - permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked - combinations including the two. You must obey the GNU General - Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to - your version of the file, but you are not obligated to do so. If - you do not wish to do so, delete this exception statement from - your version. -*/ - -#include - -#include "registrycheck.h" - -#include "implementation_p.h" - -#include -#include - -#include - -#include - -#include - -using namespace Kleo; -using namespace Kleo::_detail; -using namespace boost; - -static QString gnupg_path = QLatin1String("HKEY_LOCAL_MACHINE\\Software\\GNU\\GnuPG"); -static QString gnupg_key = QLatin1String("gpgProgram"); - -namespace { - - class RegistryCheck : public SelfTestImplementation { - public: - explicit RegistryCheck() - : SelfTestImplementation( i18nc("@title", "Windows Registry") ) - { - runTest(); - } - - void runTest() { - - m_passed = !QSettings( gnupg_path, QSettings::NativeFormat ).contains( gnupg_key ); - - if ( m_passed ) - return; - - m_error = i18n("Obsolete registry entries found"); - - m_explaination - = i18nc( "@info", - "Kleopatra detected an obsolete registry key (%1\\%2), " - "added by either a previous Gpg4win version or " - "applications such as WinPT or EnigMail." - "Keeping the entry might lead to an old GnuPG backend being used.", - gnupg_path, gnupg_key ); - m_proposedFix = i18nc( "@info", - "Delete registry key %1\\%2.", - gnupg_path, gnupg_key ); - - } - - /* reimp */ bool canFixAutomatically() const { return true; } - - /* reimp */ bool fix() { - - QSettings settings( gnupg_path, QSettings::NativeFormat ); - if ( !settings.contains( gnupg_key ) ) - return true; - - settings.remove( gnupg_key ); - settings.sync(); - - if ( settings.status() != QSettings::NoError ) { - KMessageBox::error( - 0, - i18nc("@info", - "Could not delete the registry key %1\\%2", - gnupg_path, gnupg_key ), - i18nc("@title", "Error Deleting Registry Key") ); - return false; - } - - m_passed = true; - m_error.clear(); - m_explaination.clear(); - m_proposedFix.clear(); - return true; - } - - }; -} - -shared_ptr Kleo::makeGpgProgramRegistryCheckSelfTest() { - return shared_ptr( new RegistryCheck ); -} diff --git a/kdepim/kleopatra/uiserver/uiserver_win.cpp b/kdepim/kleopatra/uiserver/uiserver_win.cpp deleted file mode 100644 index e9bd7c87..00000000 --- a/kdepim/kleopatra/uiserver/uiserver_win.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/* -*- mode: c++; c-basic-offset:4 -*- - uiserver/uiserver_win.cpp - - This file is part of Kleopatra, the KDE keymanager - Copyright (c) 2007 Klarälvdalens Datakonsult AB - - Kleopatra 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. - - Kleopatra 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; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - In addition, as a special exception, the copyright holders give - permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked - combinations including the two. You must obey the GNU General - Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to - your version of the file, but you are not obligated to do so. If - you do not wish to do so, delete this exception statement from - your version. -*/ - -#include - -#include "uiserver_p.h" - -#include "utils/gnupg-helper.h" - -#include - -#include - -#include -#include - -#include -#include -#include - -#include -#include - -using namespace Kleo; -using namespace boost; - - -QString UiServer::Private::systemErrorString() { - return QString::fromLocal8Bit( strerror(errno) ); -} - -void UiServer::Private::doMakeListeningSocket( const QByteArray & encodedFileName ) { - // Create a Unix Domain Socket: - const assuan_fd_t sock = assuan_sock_new( AF_UNIX, SOCK_STREAM, 0 ); - if ( sock == ASSUAN_INVALID_FD ) - throw_( i18n( "Could not create socket: %1", systemErrorString() ) ); - - try { - // Bind - struct sockaddr_un sa; - std::memset( &sa, 0, sizeof(sa) ); - sa.sun_family = AF_UNIX; - std::strncpy( sa.sun_path, encodedFileName.constData(), sizeof( sa.sun_path ) - 1 ); - if ( assuan_sock_bind( sock, (struct sockaddr*)&sa, sizeof( sa ) ) ) - throw_( i18n( "Could not bind to socket: %1", systemErrorString() ) ); - - if ( assuan_sock_get_nonce( (struct sockaddr*)&sa, sizeof( sa ), &nonce ) ) - throw_( i18n("Could not get socket nonce: %1", systemErrorString() ) ); - - // Listen - if ( ::listen( (SOCKET)sock, SOMAXCONN ) ) - throw_( i18n( "Could not listen to socket: %1", systemErrorString() ) ); - - if ( !setSocketDescriptor( (intptr_t)sock ) ) - throw_( i18n( "Could not pass socket to Qt: %1. This should not happen, please report this bug.", errorString() ) ); - - } catch ( ... ) { - assuan_sock_close( sock ); - throw; - } -} - diff --git a/kdepim/kmail/CMakeLists.txt b/kdepim/kmail/CMakeLists.txt index d60e0255..e8dd2009 100644 --- a/kdepim/kmail/CMakeLists.txt +++ b/kdepim/kmail/CMakeLists.txt @@ -52,8 +52,9 @@ if (KDEPIM_BUILD_DESKTOP) add_subdirectory(pics) add_subdirectory(icons) add_subdirectory(avscripts) - add_subdirectory(tests) - add_subdirectory(kconf_update) + if(ENABLE_TESTING) + add_subdirectory(tests) + endif() endif() add_subdirectory(kcm_kpimidentities) @@ -230,19 +231,6 @@ if (KDEPIM_BUILD_DESKTOP) ${CMAKE_SOURCE_DIR}/kmail/dbusinterface/org.freedesktop.Akonadi.NewMailNotifier.xml ) - - kde4_add_ui_files(kmailprivate_LIB_SRCS - ui/composercryptoconfiguration.ui - ui/warningconfiguration.ui - ui/smimeconfiguration.ui - ui/miscpagemaintab.ui - ui/securitypagegeneraltab.ui - ui/securitypagemdntab.ui - ui/identitypage.ui - ui/accountspagereceivingtab.ui - ui/searchwindow.ui - ) - # KCFG files. The main kmail.kcfg is configured by CMake and put # in the build directory. @@ -260,7 +248,7 @@ if (KDEPIM_BUILD_DESKTOP) ) - kde4_add_library(kmailprivate ${LIBRARY_TYPE} ${kmailprivate_LIB_SRCS}) + add_library(kmailprivate ${LIBRARY_TYPE} ${kmailprivate_LIB_SRCS}) target_link_libraries(kmailprivate ${KDEPIMLIBS_KMBOX_LIBS} @@ -334,8 +322,7 @@ if (KDEPIM_BUILD_DESKTOP) ########### KMail executable ############### set(kmail_SRCS main.cpp) - kde4_add_app_icon(kmail_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-kmail.png") - kde4_add_executable(kmail ${kmail_SRCS}) + add_executable(kmail ${kmail_SRCS}) target_link_libraries(kmail ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} @@ -346,8 +333,10 @@ if (KDEPIM_BUILD_DESKTOP) ) - add_subdirectory(mailmerge/tests/) - add_subdirectory(folderarchive/autotests/) + if(ENABLE_TESTING) + add_subdirectory(mailmerge/tests) + add_subdirectory(folderarchive/autotests) + endif() ########### install files ############### install(TARGETS kmailprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) diff --git a/kdepim/kmail/kcm_kpimidentities/CMakeLists.txt b/kdepim/kmail/kcm_kpimidentities/CMakeLists.txt index f5e725bc..f823fc71 100644 --- a/kdepim/kmail/kcm_kpimidentities/CMakeLists.txt +++ b/kdepim/kmail/kcm_kpimidentities/CMakeLists.txt @@ -14,7 +14,6 @@ set(kcm_identities_srcs ../identity/xfaceconfigurator.cpp ) -kde4_add_ui_files(kcm_identities_srcs ../ui/identitypage.ui) kde4_add_plugin(kcm_kpimidentities ${kcm_identities_srcs}) target_link_libraries(kcm_kpimidentities ${KDEPIMLIBS_GPGMEPP_LIBS} diff --git a/kdepim/kmail/kconf_update/CMakeLists.txt b/kdepim/kmail/kconf_update/CMakeLists.txt deleted file mode 100644 index b1e8142c..00000000 --- a/kdepim/kmail/kconf_update/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -install( FILES kmail.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) -install(PROGRAMS - upgrade-transport.pl - kmail-pgpidentity.pl - upgrade-signature.pl - kmail-upd-identities.pl - kmail-3.1-use-UOID-for-identities.pl - kmail-3.1-update-new-mail-notification-settings.pl - kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl - kmail-3.2-update-loop-on-goto-unread-settings.sh - kmail-3.2-misc.sh - kmail-3.3-use-ID-for-accounts.pl - kmail-3.3-move-identities.pl - kmail-3.3-aegypten.pl - kmail-3.3-split-sign-encr-keys.sh - kmail-3.3-misc.pl - kmail-3.3b1-misc.pl - kmail-3.4-misc.pl - kmail-3.4.1-update-status-filters.pl - kmail-3.5-trigger-flag-migration.pl - kmail-4.0-misc.pl -DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) - - diff --git a/kdepim/kmail/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl b/kdepim/kmail/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl deleted file mode 100755 index 61ca4246..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -my $presentation = -1; -my $commandline = ""; -while ( <> ) { - chomp; - if ( /^msgbox-on-mail/ ) { - my ($key,$value) = split /=/; - if( -1 == $presentation ) { - $presentation = 0; - } - $presentation += 2*( $value eq "true" ); - } - elsif ( /^exec-on-mail-cmd/ ) { - my ($key,$value) = split /=/; - $commandline = $value; - } - elsif ( /^exec-on-mail/ ) { - my ($key,$value) = split /=/; - if( -1 == $presentation ) { - $presentation = 0; - } - $presentation += 32*( $value eq "true" ); - } -} - -if ( "" ne $commandline ) { - print "commandline=$commandline\n"; -} -if ( -1 != $presentation ) { - print "presentation=$presentation\n"; -} - -print "# DELETE msgbox-on-mail\n"; -print "# DELETE exec-on-mail\n"; -print "# DELETE exec-on-mail-cmd\n"; diff --git a/kdepim/kmail/kconf_update/kmail-3.1-use-UOID-for-identities.pl b/kdepim/kmail/kconf_update/kmail-3.1-use-UOID-for-identities.pl deleted file mode 100755 index e7641482..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.1-use-UOID-for-identities.pl +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -# this script goes through all the config keys that deal with -# identities and replaces identities referenced by name to be referenced -# by UOIDs. To this end, adds uoid keys to the identity groups. - -# read the whole config file: -my $currentGroup = ""; -my %configFile; -while ( <> ) { - chomp; - next if ( /^$/ ); # skip empty lines - next if ( /^\#/ ); # skip comments - if ( /^\[/ ) { # group begin - $currentGroup = $_; - next; - } elsif ( $currentGroup =~ /^\[Identity/ and /^uoid/ ) { - # We need to prevent this script from running twice, since it - # would change UOIDs of identities then. - # Presence of a uoid key in an [Identity #n] section is the - # best indicator: - exit; - } elsif ( $currentGroup ne "" ) { # normal entry - my ($key,$value) = split /=/; - $configFile{$currentGroup}{$key}=$value; - } -} - -# filter out identity groups: -my @identityGroups = grep { /^\[Identity \#\d+\]/ } keys %configFile; - -# create UOIDs for each identity: -my %nameToUOID; -foreach my $identityGroup (@identityGroups) { - my $uoid = int(rand 0x7fFFffFF); - my $name = $configFile{$identityGroup}{'Identity'}; - $nameToUOID{$name} = $uoid; - # create the uoid entries of [Identity #n] groups: - print "${identityGroup}\nuoid=$uoid\n"; -} - -# change the default identity value: -print "# DELETE [General]Default Identity\n[General]\nDefault Identity=" - . $nameToUOID{$configFile{'[General]'}{'Default Identity'}} . "\n"; - -# [Composer]previous-identity -print "# DELETE [Composer]previous-identity\n[Composer]\nprevious-identity=" - . $nameToUOID{$configFile{'[Composer]'}{'previous-identity'}} . "\n"; - -# Now, go through all [Folder-*] groups and replace the Identity value -# with the UOID. Also, move MailingListIdentity entries to Identity entries: -my @folderGroups = grep { /^\[Folder-.*\]/ } keys %configFile; - -foreach my $folderGroup ( @folderGroups ) { - my $identity = ""; - # delete the (MailingList)Identity keys: - print "# DELETE ${folderGroup}MailingListIdentity\n"; - print "# DELETE ${folderGroup}Identity\n"; - # extract the identity name: - if ( exists ($configFile{$folderGroup}{'Identity'}) ) { - $identity = $configFile{$folderGroup}{'Identity'}; - } - if ( $identity eq "" - and exists($configFile{$folderGroup}{'MailingListIdentity'}) ) { - $identity = $configFile{$folderGroup}{'MailingListIdentity'}; - } - # write the new Identity= key if we have an UOID for the identity: - if ( exists( $nameToUOID{$identity} ) ) { - print "$folderGroup\nIdentity=" . $nameToUOID{$identity} . "\n"; - } -} - -# Now, go through all [Filter #n] groups and change arguments to the -# 'set identity' filter action to use UOIDs: - -my @filterGroups = grep { /^\[Filter \#\d+\]/ } keys %configFile; - -foreach my $filterGroup (@filterGroups) { - my $numActions = +$configFile{$filterGroup}{'actions'}; - # go through all actions in search for "set identity": - for ( my $i = 0 ; $i < $numActions ; ++$i ) { - my $actionName = "action-name-$i"; - my $actionArgs = "action-args-$i"; - if ( $configFile{$filterGroup}{$actionName} eq "set identity" ) { - # found one: replace it's argument with the UOID: - print "# DELETE $filterGroup$actionArgs\n$filterGroup\n$actionArgs=" - . $nameToUOID{$configFile{$filterGroup}{$actionArgs}} . "\n"; - } - } -} - diff --git a/kdepim/kmail/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl b/kdepim/kmail/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl deleted file mode 100644 index 0dba9080..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -# this script goes through all the config keys that deal with -# identities and replaces UOID 0 (which was erroneously always assigned to the -# first identity) with a non-zero UOID. - -# read the whole config file -my $currentGroup = ""; -my %configFile; -while ( <> ) { - chomp; - next if ( /^$/ ); # skip empty lines - next if ( /^\#/ ); # skip comments - if ( /^\[/ ) { # group begin - $currentGroup = $_; - next; - } elsif ( $currentGroup ne "" ) { # normal entry - my ($key,$value) = split /=/; - $configFile{$currentGroup}{$key}=$value; - } -} - -# filter out identity groups -my @identityGroups = grep { /^\[Identity \#\d+\]/ } keys %configFile; - -# create new UOID for an identity with UOID 0 -my $newUoid = 0; -foreach my $identityGroup (@identityGroups) { - my $oldUoid = $configFile{$identityGroup}{'uoid'}; - if ( $oldUoid eq "0" ) { - $newUoid = int(rand 0x7fFFffFE) + 1; - # change the uoid entry this identity - print "# DELETE ${identityGroup}uoid\n"; - print "${identityGroup}\nuoid=$newUoid\n"; - } -} - -if ( $newUoid != 0 ) { - # change the default identity value if it was 0 - my $tempId = $configFile{'[General]'}{'Default Identity'}; - if ( $tempId eq "0" ) { - print "# DELETE [General]Default Identity\n"; - print "[General]\nDefault Identity=$newUoid\n"; - } - - # [Composer]previous-identity - $tempId = $configFile{'[Composer]'}{'previous-identity'}; - if ( $tempId eq "0" ) { - print "# DELETE [Composer]previous-identity\n"; - print "[Composer]\nprevious-identity=$newUoid\n"; - } - - # Now, go through all [Folder-*] groups and replace all occurrences of - # Identity=0 with Identity=$newUoid - my @folderGroups = grep { /^\[Folder-.*\]/ } keys %configFile; - - foreach my $folderGroup ( @folderGroups ) { - $tempId = $configFile{$folderGroup}{'Identity'}; - if ( $tempId eq "0" ) { - print "# DELETE ${folderGroup}Identity\n"; - print "$folderGroup\nIdentity=$newUoid\n"; - } - } - - # Now, go through all [Filter #n] groups and replace all occurrences of - # UOID 0 as argument to the 'set identity' filter action with the new UOID - my @filterGroups = grep { /^\[Filter \#\d+\]/ } keys %configFile; - - foreach my $filterGroup (@filterGroups) { - my $numActions = +$configFile{$filterGroup}{'actions'}; - # go through all actions in search for "set identity": - for ( my $i = 0 ; $i < $numActions ; ++$i ) { - my $actionName = "action-name-$i"; - my $actionArgs = "action-args-$i"; - if ( $configFile{$filterGroup}{$actionName} eq "set identity" ) { - # found one: - # replace it's argument with the new UOID if necessary - $tempId = $configFile{$filterGroup}{$actionArgs};; - if ( $tempId eq "0" ) { - print "# DELETE $filterGroup$actionArgs\n"; - print "$filterGroup\n$actionArgs=$newUoid\n"; - } - } - } - } -} diff --git a/kdepim/kmail/kconf_update/kmail-3.2-misc.sh b/kdepim/kmail/kconf_update/kmail-3.2-misc.sh deleted file mode 100755 index 6f6314d2..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.2-misc.sh +++ /dev/null @@ -1,78 +0,0 @@ -#! /usr/bin/env bash - -function delete_this_key() { - echo "# DELETE [$GROUP]$KEY" -} - -while read; do - if [ "${REPLY#\[}" != "$REPLY" ] ; then # group name - GROUP="${REPLY:1:${#REPLY}-2}" - continue; - fi - # normal key=value pair: - KEY="${REPLY%%=*}" - VALUE="${REPLY#*=}" - - case "$GROUP/$KEY" in - Geometry/MimePaneHeight) - case "$VALUE" in - [0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9]) ;; - *) VALUE=100 ;; - esac - GeometryMimePaneHeight="$VALUE" - ;; - Geometry/MessagePaneHeight) - delete_this_key; - case "$VALUE" in - [0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9]) ;; - *) VALUE=180 ;; - esac - GeometryMessagePaneHeight="$VALUE" - ;; - Geometry/FolderPaneHeight) - # - # keys to delete - # - delete_this_key - ;; - Geometry/windowLayout) - # - # break [Geometry]windowLayout={0,1,2,3,4} into - # [Geometry]FolderList={long,short} and - # [Reader]MimeTreeLocation={top,bottom} - # - delete_this_key - case "$VALUE" in - [0-4]) ;; - *) VALUE=1 ;; - esac - location=("top" "bottom" "bottom" "top" "top") - folder=("long" "long" "long" "short" "short") - echo "[Reader]" - echo "MimeTreeLocation=${location[$VALUE]}" - echo "[Geometry]" - echo "FolderList=${folder[$VALUE]}" - continue; - ;; - Geometry/showMIME) - # - # Rename [Geometry]showMime={0,1,2} into - # [Reader]MimeTreeMode={never,smart,always} - # - delete_this_key - case "$VALUE" in - [0-2]) ;; - *) VALUE=1 ;; - esac - substitution=("never" "smart" "always") - echo "[Reader]" - echo "MimeTreeMode=${substitution[$VALUE]}" - continue; - ;; - esac -done - -if [ "$GeometryMimePaneHeight" ] && [ "$GeometryMessagePaneHeight" ]; then - echo "[Geometry]" - echo "ReaderPaneHeight=$(($GeometryMimePaneHeight+$GeometryMessagePaneHeight))" -fi diff --git a/kdepim/kmail/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh b/kdepim/kmail/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh deleted file mode 100755 index e98b27dd..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /usr/bin/env bash - -while read; do - KEY="${REPLY%%=*}" - VALUE="${REPLY#*=}" - if [ "$KEY" = "LoopOnGotoUnread" ]; then - case "$VALUE" in - [Ff][Aa][Ll][Ss][Ee]|0) - echo "LoopOnGotoUnread=0" - ;; - 2) # we were run already, be nice and don't change anything - echo "LoopOnGotoUnread=2" - ;; - *) # default - echo "LoopOnGotoUnread=1" - ;; - esac - else - echo "$REPLY" - fi -done diff --git a/kdepim/kmail/kconf_update/kmail-3.3-aegypten.pl b/kdepim/kmail/kconf_update/kmail-3.3-aegypten.pl deleted file mode 100644 index e891ea48..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.3-aegypten.pl +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -# This script updates some configuration keys and adds a 'mailto:' to all -# mailing list posting addresses - -# read the whole config file -my $currentGroup = ""; -my %configFile; -while ( <> ) { - chomp; # eat the trailing '\n' - next if ( /^$/ ); # skip empty lines - next if ( /^\#/ ); # skip comments - if ( /^\[/ ) { # group begin - $currentGroup = $_; - next; - } elsif ( $currentGroup eq "" and /^pgpType/ ) { - my ($key,$value) = split /=/; - # 0 is auto -> delete key, i.e. use the default - # 1-4 map to the kpgp ones - # 5 is off -> off; since there's no such backend it won't set one - if ( $value != 0 ) { - my @newvalues = ("","Kpgp/gpg1","Kpgp/pgp v2","Kpgp/pgp v5","Kpgp/pgp v6",""); - print "OpenPGP=$newvalues[$value]\n"; - } - } -} diff --git a/kdepim/kmail/kconf_update/kmail-3.3-misc.pl b/kdepim/kmail/kconf_update/kmail-3.3-misc.pl deleted file mode 100644 index 42b00812..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.3-misc.pl +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -# This script updates some configuration keys - -# read the whole config file -my $currentGroup = ""; -my %configFile; -while ( <> ) { - chomp; # eat the trailing '\n' - next if ( /^$/ ); # skip empty lines - next if ( /^\#/ ); # skip comments - if ( /^\[/ ) { # group begin - $currentGroup = $_; - next; - } elsif ( $currentGroup eq "[General]" and /^sendOnCheck/ ) { - my ($key,$value) = split /=/; - print "# DELETE $currentGroup$key\n"; - if ( $value eq "true" ) { - print "[Behaviour]\nSendOnCheck=SendOnManualCheck\n"; - } - else { - print "[Behaviour]\nSendOnCheck=DontSendOnCheck\n"; - } - } -} diff --git a/kdepim/kmail/kconf_update/kmail-3.3-move-identities.pl b/kdepim/kmail/kconf_update/kmail-3.3-move-identities.pl deleted file mode 100644 index 835cf4ff..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.3-move-identities.pl +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/perl -# David Faure -# License: GPL - -$currentGroup = ""; - -while (<>) { - next if /^$/; - # recognize groups: - if ( /^\[(.+)\]$/ ) { - $currentGroup = $1; - if ( $currentGroup =~ /^Identity/ ) { - print "# DELETEGROUP [$currentGroup]\n"; - print "[$currentGroup]\n"; - } - next; - }; - # Move over keys from the identity groups - if ( $currentGroup =~ /^Identity/ ) { - print; - } - # Move over the key for the default identity - elsif ( $currentGroup eq 'General' ) { - ($key,$value) = split /=/; - chomp $value; - if ( $key eq 'Default Identity' ) { - print "[$currentGroup]\n$key=$value\n"; - print "# DELETE [$currentGroup]$key\n"; - } - } -} diff --git a/kdepim/kmail/kconf_update/kmail-3.3-split-sign-encr-keys.sh b/kdepim/kmail/kconf_update/kmail-3.3-split-sign-encr-keys.sh deleted file mode 100755 index 87c7a389..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.3-split-sign-encr-keys.sh +++ /dev/null @@ -1,31 +0,0 @@ -#! /usr/bin/env bash - -function delete_this_key() { - echo "# DELETE [$GROUP]$KEY" -} - -while read; do - # Currently unused - if [ "${REPLY#\[}" != "$REPLY" ] ; then # group name - GROUP="${REPLY:1:${#REPLY}-2}" - continue; - fi - # normal key=value pair: - KEY="${REPLY%%=*}" - VALUE="${REPLY#*=}" - - case "$GROUP" in - Identity*) - echo "# got Identity Key \"$KEY\"" - case "$KEY" in - "Default PGP Key") - echo "[$GROUP]" - echo "PGP Signing Key=$VALUE" - echo "[$GROUP]" - echo "PGP Encryption Key=$VALUE" - delete_this_key - ;; - esac - ;; - esac -done diff --git a/kdepim/kmail/kconf_update/kmail-3.3-use-ID-for-accounts.pl b/kdepim/kmail/kconf_update/kmail-3.3-use-ID-for-accounts.pl deleted file mode 100755 index 21daf743..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.3-use-ID-for-accounts.pl +++ /dev/null @@ -1,236 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -# this script goes through all the config keys that deal with -# accounts and replaces accounts referenced by name to be referenced -# by IDs. -# It also renames the toplevel-folder and the sent/trash/drafts folder -# accordingly and renames all references -# last but not least we move the lokal folder-cache of (d)imap folders - -# read the whole config file -my $currentGroup = ""; -my %configFile; -while ( <> ) { - chomp; - next if ( /^$/ ); # skip empty lines - next if ( /^\#/ ); # skip comments - if ( /^\[/ ) { # group begin - $currentGroup = $_; - next; - } elsif ( $currentGroup =~ /^\[Account/ and /^Id/ ) { - # We need to prevent this script from running twice, since it - # would change IDs of accounts then. - # Presence of a id key in an Account section is the - # best indicator - exit; - } elsif ( $currentGroup ne "" ) { # normal entry - my ($key,$value) = split /=/; - $configFile{$currentGroup}{$key}=$value; - } -} - -# filter out account groups -my @accountGroups = grep { /^\[Account \d+\]/ } keys %configFile; - -# create IDs for each account -my %nameToID; -my %nameToType; -foreach my $accountGroup (@accountGroups) { - my $id; - do { - $id = int(rand 0x7fFFffFF); - } while ($id <= 0); - my $name = $configFile{$accountGroup}{'Name'}; - # remember id and type - $nameToID{$name} = $id; - $nameToType{$name} = $configFile{$accountGroup}{'Type'}; - # create the id entries - print "${accountGroup}\nId=$id\n"; -} - -foreach my $accountGroup (@accountGroups) { - # rename the trash - my $trash = $configFile{$accountGroup}{'trash'}; - if (&replaceID($trash)) { - print "# DELETE ".$accountGroup."trash\n"; - print "${accountGroup}\ntrash=".&replaceID($trash)."\n"; - } -} - -# we need the directory where the imap cache is stored -open(CMD, "kde4-config --localprefix|"); -my $basedir = ; -chomp( $basedir ); -$basedir = $basedir."share/apps/kmail"; - -# Now, go through all [Folder-*] groups that belong to (d)imap folders -# and replace the account name with the id -my @folderGroups = grep { /^\[Folder-.*\]/ } keys %configFile; - -foreach my $folderGroup ( @folderGroups ) -{ - my $isRootFolder = 1; - # extract the accountname - my (@parts) = split (/\[Folder-/,$folderGroup); - my $account = substr($parts[1], 0, -1); - if ($account =~ /^[^\/]*\.directory\//) - { - # .account.directory - my (@dirparts) = split (/\.directory\//,$account); - $account = substr( $dirparts[0], 1 ); - # this is no root folder - $isRootFolder = 0; - } - # delete the old group and write the new entry - my $accountDecoded = QFileDecode( $account ); - if ( exists( $nameToID{$accountDecoded} ) ) - { - my $id = $nameToID{$accountDecoded}; - print "# DELETEGROUP $folderGroup\n"; - my $folderGroupNew = $folderGroup; - my $pattern = quotemeta( $account ); - $folderGroupNew =~ s/$pattern/$id/; - # new account section - print "$folderGroupNew\n"; - # print all original keys - my %groupData = %{$configFile{$folderGroup}}; - foreach my $key ( keys %groupData ) { - print "$key=" . $groupData{$key} . "\n"; - } - if ($isRootFolder) { - # new label and id of this rootfolder - print "SystemLabel=$account\n"; - print "Id=".$id."\n"; - - # move the directory - my $subdir; - if ($nameToType{$accountDecoded} eq "imap") { - $subdir = "imap"; - } elsif ($nameToType{$accountDecoded} eq "cachedimap") { - $subdir = "dimap"; - } - my $oldname = QFileEncode( "$basedir/$subdir/\.$account\.directory" ); - my $systemcall = "mv '$oldname' '$basedir/$subdir/\.".$id."\.directory'"; - system($systemcall); - - $oldname = QFileEncode( "$basedir/$subdir/$account" ); - $systemcall = "mv '$oldname' '$basedir/$subdir/".$id."'"; - system($systemcall); - - $oldname = QFileEncode( "$basedir/$subdir/\.$account\.index" ); - $systemcall = "mv '$oldname' '$basedir/$subdir/\.".$id."\.index'"; - system($systemcall); - - $oldname = QFileEncode( "$basedir/$subdir/\.$account\.index.ids" ); - $systemcall = "mv '$oldname' '$basedir/$subdir/\.".$id."\.index.ids'"; - system($systemcall); - } - } -} - -# go through all identities and replace the sent-mail and drafts folder -my @identities = grep { /^\[Identity #\d\]/ } keys %configFile; - -foreach my $identity (@identities) -{ - my $drafts = $configFile{$identity}{'Drafts'}; - my $sent = $configFile{$identity}{'Fcc'}; - # extract the account name - if (&replaceID($drafts)) - { - print "# DELETE ".$identity."Drafts\n"; - print "${identity}\nDrafts=".&replaceID($drafts)."\n"; - } - if (&replaceID($sent)) - { - print "# DELETE ".$identity."Fcc\n"; - print "${identity}\nFcc=".&replaceID($sent)."\n"; - } -} - -# go through all filters and replace the target -my @filterGroups = grep { /^\[Filter \#\d+\]/ } keys %configFile; -foreach my $filterGroup (@filterGroups) -{ - my $numActions = +$configFile{$filterGroup}{'actions'}; - # go through all actions in search for "set identity": - for ( my $i = 0 ; $i < $numActions ; ++$i ) - { - my $actionName = "action-name-$i"; - my $actionArgs = "action-args-$i"; - if ( $configFile{$filterGroup}{$actionName} eq "transfer" && - &replaceID($configFile{$filterGroup}{$actionArgs}) ) - { - print "# DELETE $filterGroup$actionArgs\n"; - print "$filterGroup\n$actionArgs=". - &replaceID($configFile{$filterGroup}{$actionArgs})."\n"; - } - } -} - -# previous fcc -my $pfcc = $configFile{'[Composer]'}{'previous-fcc'}; -if (&replaceID($pfcc)) { - print "# DELETE [Composer]previous-fcc\n"; - print "[Composer]\nprevious-fcc=".&replaceID($pfcc)."\n"; -} - -# GroupwareFolder -my $groupware = $configFile{'[Groupware]'}{'GroupwareFolder'}; -if (&replaceID($groupware)) { - print "# DELETE [Groupware]GroupwareFolder\n"; - print "[Groupware]\nGroupwareFolder=".&replaceID($groupware)."\n"; -} - -# and finally the startupFolder -my $startup = $configFile{'[General]'}{'startupFolder'}; -if (&replaceID($startup)) { - print "# DELETE [General]startupFolder\n"; - print "[General]\nstartupFolder=".&replaceID($startup)."\n"; -} - -## Returns input string with replaced account name -## If there is nothing to replace it returns undef -sub replaceID -{ - my ($input) = @_; - - if ($input && $input =~ /\.directory/) - { - my (@dirparts) = split (/\.directory\//,$input); - my $account = substr( $dirparts[0], 1 ); - my $accountDecoded = QFileDecode( $account ); - if ( exists( $nameToID{$accountDecoded} ) ) - { - my $pattern = quotemeta( $account ); - $input =~ s/$pattern/$nameToID{$accountDecoded}/; - return $input; - } - } -} - -## emulate QFileDecode -sub QFileDecode -{ - my ($input) = @_; - - $input =~ s/%20/ /g; - $input =~ s/%40/\@/g; - $input =~ s/%25/%/g; # must be the last one - - return $input; -} - -## emulate QFileEncode -sub QFileEncode -{ - my ($input) = @_; - - $input =~ s/%/%25/g; # must be the first one - $input =~ s/ /%20/g; - $input =~ s/\@/%40/g; - - return $input; -} diff --git a/kdepim/kmail/kconf_update/kmail-3.3b1-misc.pl b/kdepim/kmail/kconf_update/kmail-3.3b1-misc.pl deleted file mode 100644 index b362850f..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.3b1-misc.pl +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -# This script updates some configuration keys and adds a 'mailto:' to all -# mailing list posting addresses - -# read the whole config file -my $currentGroup = ""; -my %configFile; -while ( <> ) { - chomp; # eat the trailing '\n' - next if ( /^$/ ); # skip empty lines - next if ( /^\#/ ); # skip comments - if ( /^\[/ ) { # group begin - $currentGroup = $_; - next; - } elsif ( $currentGroup eq "[General]" and /^systray-on-mail/ ) { - my ($key,$value) = split /=/; - print "# DELETE $currentGroup$key\n"; - print "[General]\nSystemTrayEnabled=$value\n"; - } elsif ( $currentGroup eq "[General]" and /^systray-on-new/ ) { - my ($key,$value) = split /=/; - print "# DELETE $currentGroup$key\n"; - if ( $value eq "true" ) { - print "[General]\nSystemTrayPolicy=ShowOnUnread\n"; - } - else { - print "[General]\nSystemTrayPolicy=ShowAlways\n"; - } - } elsif ( /^MailingListPostingAddress/ ) { - my ($key,$value) = split /=/; - if ( not $value eq "" and not $value =~ /^mailto:/ ) { - print "# DELETE $currentGroup$key\n"; - print "$currentGroup\n$key=mailto:$value\n"; - } - } -} diff --git a/kdepim/kmail/kconf_update/kmail-3.4-misc.pl b/kdepim/kmail/kconf_update/kmail-3.4-misc.pl deleted file mode 100644 index e9be4ff8..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.4-misc.pl +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -# This script updates some configuration keys - -# read the whole config file -my $currentGroup = ""; -my %configFile; -while ( <> ) { - chomp; # eat the trailing '\n' - next if ( /^$/ ); # skip empty lines - next if ( /^\#/ ); # skip comments - if ( /^\[/ ) { # group begin - $currentGroup = $_; - next; - } elsif ( $currentGroup eq "[Behaviour]" and /^JumpToUnread/ ) { - my ($key,$value) = split /=/; - print "# DELETE $currentGroup$key\n"; - if ( $value eq "true" ) { - print "[Behaviour]\nActionEnterFolder=SelectFirstUnreadNew\n"; - } - else { - print "[Behaviour]\nActionEnterFolder=SelectFirstNew\n"; - } - } -} diff --git a/kdepim/kmail/kconf_update/kmail-3.4.1-update-status-filters.pl b/kdepim/kmail/kconf_update/kmail-3.4.1-update-status-filters.pl deleted file mode 100644 index 735daf77..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.4.1-update-status-filters.pl +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -# This script converts lower case status filter rules to upper case. - -# read the whole config file -my $currentGroup = ""; -my %configFile; -while ( <> ) { - chomp; - next if ( /^$/ ); # skip empty lines - next if ( /^\#/ ); # skip comments - if ( /^\[/ ) { # group begin - $currentGroup = $_; - next; - } elsif ( $currentGroup ne "" ) { # normal entry - my ($key,$value) = split /=/; - $configFile{$currentGroup}{$key}=$value; - } -} - -# go through all filters and check for rules which are no longer valid -my @filterGroups = grep { /^\[Filter \#\d+\]/ } keys %configFile; -foreach my $filterGroup (@filterGroups) { - my $numRules = $configFile{$filterGroup}{'rules'}; - # go through all rules: - for ( my $i = 0; $i < $numRules; ++$i ) { - my $c = chr( ord("A") + $i ); - my $fieldKey = "field$c"; - my $field = $configFile{$filterGroup}{$fieldKey}; - if ( $field eq "" ) { - my $contentsKey = "contents$c"; - my $contents = $configFile{$filterGroup}{$contentsKey}; - if ( $contents =~ /^[a-z]/ ) { - $contents = ucfirst( $contents ); - print "# DELETE $filterGroup$contentsKey\n"; - print "$filterGroup\n$contentsKey=$contents\n"; - } - } - } -} diff --git a/kdepim/kmail/kconf_update/kmail-3.5-trigger-flag-migration.pl b/kdepim/kmail/kconf_update/kmail-3.5-trigger-flag-migration.pl deleted file mode 100644 index 809a611a..00000000 --- a/kdepim/kmail/kconf_update/kmail-3.5-trigger-flag-migration.pl +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/perl -# -# Copyright (c) 2007 Volker Krause -# -# 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. -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US -# - -$currentGroup = ""; - -$source = $ARGV[0]; - -while () { - chomp; - next if /^$/; - next if /^\#/; - - # recognize groups: - if ( /^\[(.+)\]$/ ) { - $currentGroup = $_; - next; - }; - - ($key,$value) = split /=/; - next if $key eq ""; - - if ( $currentGroup =~ /^\[Folder/ ) { - if( ($key eq "UploadAllFlags" or $key eq "StatusChangedLocally") and not $value eq "true" ) { - $value = "true"; - print "#DELETE $currentGroup $key\n"; - print "$currentGroup\n$key=$value\n" - } - } -} diff --git a/kdepim/kmail/kconf_update/kmail-4.0-misc.pl b/kdepim/kmail/kconf_update/kmail-4.0-misc.pl deleted file mode 100755 index 25092580..00000000 --- a/kdepim/kmail/kconf_update/kmail-4.0-misc.pl +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -# read the whole config file -my $currentGroup = ""; -my %configFile; -while ( <> ) { - chomp; - next if ( /^$/ ); # skip empty lines - next if ( /^\#/ ); # skip comments - if ( /^\[/ ) { # group begin - $currentGroup = $_; - next; - } elsif ( $currentGroup ne "" ) { # normal entry - my ($key,$value) = split /=/; - $configFile{$currentGroup}{$key}=$value; - } -} - -# filter out account groups -my @accountGroups = grep { /^\[Account \d+\]/ } keys %configFile; - -# create new account type -my $newType; -foreach my $accountGroup (@accountGroups) { - my $oldType = $configFile{$accountGroup}{'Type'}; - $newType = $oldType; - if ( $oldType eq "pop" or $oldType eq "6" ) { - $newType = "Pop"; - } - if ( $oldType eq "cachedimap" or $oldType eq "4" ) { - $newType = "DImap"; - } - if ( $oldType eq "local" or $oldType eq "5" ) { - $newType = "Local"; - } - if ( $oldType eq "maildir" or $oldType eq "2" ) { - $newType = "Maildir"; - } - if ( $oldType eq "imap" or $oldType eq "0" ) { - $newType = "Imap"; - } - - # change the type entry this account - print "# DELETE ${accountGroup}Type\n"; - print "${accountGroup}\nType=$newType\n"; -} \ No newline at end of file diff --git a/kdepim/kmail/kconf_update/kmail-pgpidentity.pl b/kdepim/kmail/kconf_update/kmail-pgpidentity.pl deleted file mode 100755 index b6e7bcad..00000000 --- a/kdepim/kmail/kconf_update/kmail-pgpidentity.pl +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/perl - -# For each KMail Identity convert the "PGP Identity" entry (which contains a -# user ID) to a "Default PGP Key" entry (which contains a key ID) - -$DEBUG = 0; - -while(<>) -{ - if( /\[(Identity.*)\]/ ) - { - $section = $1; - next; - } - if( /^PGP Identity=(.*)$/ ) - { - print STDERR "\n[$section]PGP Identity=$1\n" if ( $DEBUG ); - - if( ( $1 ne "" ) && - ( open GnuPG, "gpg --list-secret-keys --utf8-strings '$1' |" ) ) - { - while () - { - # search in gpg's output for the key id of the first matching key - if(/^sec[^\/]*\/([0-9A-F]*)/) - { - print "[$section]\nDefault PGP Key=$1\n"; - last; - } - } - } - print "# DELETE [$section]PGP Identity\n"; - } -} diff --git a/kdepim/kmail/kconf_update/kmail-upd-identities.pl b/kdepim/kmail/kconf_update/kmail-upd-identities.pl deleted file mode 100755 index 3dd9f4e9..00000000 --- a/kdepim/kmail/kconf_update/kmail-upd-identities.pl +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/perl - -my (%data); - -$currentGroup = ""; - -while (<>) { - next if /^$/; - # filter out groups: - if ( /^\[(.+)\]$/ ) { $currentGroup = $1; next; }; - # store all keys regarding Identities in the hash: - if ( $currentGroup =~ /^Identity/ ) { - ($key,$value) = split /=/; - chomp $value; - $data{$currentGroup}{$key} = $value; - } -} - -# We need to prevent this script from being run twice, since it would -# kill all identities then. -# Non-presence of the [Identity]IdentityList key is the best indiator: -unless ( defined( $data{'Identity'}{'IdentityList'} ) ) { exit; } - -# first, delete all old groups: -foreach $group ( keys %data ) { - print "# DELETEGROUP [$group]\n"; -} - -# now, extract the list of valid identities (and their sequence): -$rawIdentityList = $data{'Identity'}{'IdentityList'}; -# don't include the IdentityList anymore: -delete $data{'Identity'}{'IdentityList'}; -# remove backslash-quoting: -$rawIdentityList =~ s/\\(.)/$1/g; -# split into a list at unquoted commas: -@identities = split /(? -RemoveKey=user -# Default to KAddressbook -Id=6 -File=kmail2rc -Group=General -RemoveKey=addressbook -RemoveGroup=Addressbook -# createOwnMessageIdHeaders -> useCustomMessageIdSuffix -Id=7 -File=kmail2rc -Group=General -Key=createOwnMessageIdHeaders,useCustomMessageIdSuffix -# Upgrade "PGP Identity" (KDE 2.2.x) -> "Default PGP Key" (KDE 3.0) -Id=8 -File=kmail2rc -Script=kmail-pgpidentity.pl,perl -# -# KDE 3.0 released -# -# Uppgrade the signature config options (where a trailing pipe (|) meant -# to interpret the filename as a command (KDE 3.0 -> KDE 3.1) -Id=9 -File=kmail2rc -Script=upgrade-signature.pl,perl -# rename the config groups associated with identities. -# get rid of Identity/IdentityList and addd group [IdentityManager] with -# keys Idenities (number of identities) and "Default Identity" (3.0->3.1): -Id=3.1-update-identities -File=kmail2rc -Script=kmail-upd-identities.pl,perl -# identify identities by UOID, not name... -Id=3.1-use-identity-uoids -File=kmail2rc -Script=kmail-3.1-use-UOID-for-identities.pl,perl -# update new mail notification settings -Id=3.1-new-mail-notification -File=kmail2rc,kmail.eventsrc -Group=General,new-mail-arrived -Options=overwrite -Script=kmail-3.1-update-new-mail-notification-settings.pl,perl -# -# KDE 3.1 released -# -Id=3.2-update-loop-on-goto-unread-settings -File=kmail2rc -Group=Behaviour -Key=LoopOnGotoUnread -Script=kmail-3.2-update-loop-on-goto-unread-settings.sh,bash -# due to a bug the first identity always had UOID 0, assign another UOID -Id=3.1.4-dont-use-UOID-0-for-any-identity -File=kmail2rc -Script=kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl,perl -Id=3.2-misc -########## W A R N I N G #### W A R N I N G #### W A R N I N G ####### -# collection of small adjustments. Since updates will be added to this -# script during the pre-3.2 development, HEAD users should regularly -# remove the "3.2-{misc,moves}-xx" keys from their kmail2rc and kconf_updaterc. -# For this to work, the script MUST be idempotent, ie. be robust -# against being run multiple times. -###################################################################### -File=kmail2rc -Script=kmail-3.2-misc.sh,bash -# -# reuse this section to add trivial stuff! -# -Id=3.2-moves -File=kmail2rc -Group=Geometry,Reader -Key=MimePaneHeight -# -Id=3.3-use-ID-for-accounts -File=kmail2rc -Script=kmail-3.3-use-ID-for-accounts.pl,perl -# -Id=3.3-update-filter-rules -File=kmail2rc -Script=kmail-3.3-update-filter-rules.pl,perl -# -Id=3.3-move-identities-to-own-file -File=kmail2rc,emailidentities -Script=kmail-3.3-move-identities.pl,perl -# -# aegypten: moving options from kpgprc to kmailrc -# -Id=3.3-aegypten-kpgprc-to-kmailrc -File=kpgprc,kmail2rc -Group=,Composer -Key=showEncryptionResult,crypto-show-encryption-result -Key=encryptToSelf,crypto-encrypt-to-self -Key=showKeysForApproval,crypto-show-keys-for-approval - -Id=3.3-aegypten-kpgprc-to-libkleopatrarc -File=kpgprc,libkleopatrarc -Group=,Backends -Script=kmail-3.3-aegypten.pl,perl - -Id=3.3-aegypten-emailidentities-split-sign-encr-keys -File=emailidentities -Script=kmail-3.3-split-sign-encr-keys.sh -# -Id=3.3-misc -########## W A R N I N G #### W A R N I N G #### W A R N I N G ####### -# collection of small adjustments. Since updates will be added to this -# script during the pre-3.3 development, HEAD users should regularly -# remove the "3.3-{misc,moves}-xx" keys from their kmailrc and kconf_updaterc. -# For this to work, the script MUST be idempotent, ie. be robust -# against being run multiple times. -###################################################################### -File=kmail2rc -Script=kmail-3.3-misc.pl,perl -# -# Updates which were added after the release of KDE 3.3 Beta 1 -Id=3.3b1-misc -File=kmail2rc -Script=kmail-3.3b1-misc.pl,perl -# Updates which were added after the release of KDE 3.3 -Id=3.4 -File=kmail2rc -Script=kmail-3.4-misc.pl,perl -# Remove the MenuBar key so that menu bar will be visible in the separate reader window -Id=3.4a -File=kmail2rc -Group=Separate Reader Window -RemoveKey=MenuBar -# Use the normal message list font for the new fonts for important/new/unread -Id=3.4b -File=kmail2rc -Group=Fonts -Options=copy -Key=list-font,list-important-font -Options=copy -Key=list-font,list-new-font -Options=copy -Key=list-font,list-unread-font -# Convert status filter rules to upper case (cf. bug #101001) -Id=3.4.1 -File=kmail2rc -Script=kmail-3.4.1-update-status-filters.pl,perl -# Remove the stored size so that we get a reasonable default now that we have 2 columns in the folder selection dialog -Id=3.5.4 -File=kmail2rc -Group=FolderSelectionDialog -RemoveKey=Size -# Trigger migration of all local imap flags to the server -Id=3.5.7-imap-flag-migration -Options=overwrite -File=kmail2rc -Script=kmail-3.5-trigger-flag-migration.pl,perl - -# Misc settings for KMail in KDE 4.0 -Id=4.0-misc -File=kmail2rc -Script=kmail-4.0-misc.pl,perl - -########## W A R N I N G #### W A R N I N G #### W A R N I N G ####### -# collection of small adjustments. Since updates will be added to this -# script during the pre-4.0 development, trunk users should regularly -# remove the "4.0-{misc,moves}-xx" keys from their kmailrc and kconf_updaterc. -# For this to work, the script MUST be idempotent, ie. be robust -# against being run multiple times. -###################################################################### -# Misc settings for KMail in KDE 4.2 -Id=4.2 -File=kmail2rc -Group=General -Key=showTodoColumn,showToActColumn -Group=Reader -Key=TodoMessage,ToActMessage -Group=Fonts -Key=list-todo-font,list-toact-font - -########## W A R N I N G #### W A R N I N G #### W A R N I N G ####### -# collection of small adjustments. Since updates will be added to this -# script during the pre-4.4 Akonadi, trunk users should regularly -# remove the "4.4-{misc,moves}-xx" keys from their kmailrc and kconf_updaterc. -# For this to work, the script MUST be idempotent, ie. be robust -# against being run multiple times. -###################################################################### -# Misc settings for KMail-akonadi -Id=4.4-akonadi -File=kmail2rc -Group=Reader -Key=showColorbar,showColorBar -Group=MessageListView -Key=DisplayMessageToolTips,MessageToolTipEnabled -Group=MessageListView -Key=HideTabBarWithSingleTab,AutoHideTabBarWithSingleTab -Key=list-todo-font,list-toact-font -Group=Reader,MessageListView::Fonts -Key=list-font,MessageListFont -Key=list-important-font,ImportantMessageFont -Key=list-new-font,NewMessageFont -Key=list-unread-font,UnreadMessageFont -Key=list-toact-font,TodoMessageFont -Group=Reader,MessageListView::Colors -Key=NewMessage,NewMessageColor -Key=UnreadMessage,UnreadMessageColor -Key=FlagMessage,ImportantMessageColor -Key=ToActMessage,TodoMessageColor - -Id=4.12 -File=kmail2rc -Group=General,Print -Key=PrintSelectedText,PrintSelectedText - - -Id=4.13 -File=akonadi_folderarchive_agentrc,foldermailarchiverc -AllGroups - -Id=4.13.2 -File=kmail2rc -Group=GrantleeTheme -Key=grantlee-theme-name,grantlee-mail-theme-name - -# -# Important notice: -# If you add updates here, keep this text below them. -# Make sure your updates can be safely run twice and add any new Id -# to the QStringList in kmail/kmstartup.cpp:checkConfigUpdates(). -# Collect smaller stuff in kmail--misc and -moves! -# (mmutz) -# diff --git a/kdepim/kmail/kconf_update/upgrade-signature.pl b/kdepim/kmail/kconf_update/upgrade-signature.pl deleted file mode 100755 index 23c3d63b..00000000 --- a/kdepim/kmail/kconf_update/upgrade-signature.pl +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/perl - -my (%data); -my $section = ""; - -sub process { - # delete obsolete keys: - print "# DELETE [$section]UseSignatureFile\n"; - - # now determine the type of signature: - if ( $data{'usefile'} =~ /false/i ) { - # type = inline - if ( $data{'inline'} ne "" ) { - print "[$section]\nSignature Type=inline\n"; - } else { - print "[$section]\nSignature Type=disabled\n"; - print "# DELETE [$section]Inline Signature\n"; - } - print "# DELETE [$section]Signature File\n"; - } else { - # type = file or command - if ( $data{'file'} =~ /\|$/ ) { - # a trailing pipe means: - # type = command - chop $data{'file'}; - print "[$section]\nSignature Type=command\n"; - print "[$section]\nSignature Command=", $data{'file'}, "\n"; - print "# DELETE [$section]Signature File\n"; - print "# DELETE [$section]Inline Signature\n"; - } elsif ( $data{'file'} eq "" ) { - # empty filename means: - # type = disabled - print "[$section]\nSignature Type=disabled\n"; - print "# DELETE [$section]Inline Signature\n"; - print "# DELETE [$section]Signature File\n"; - } else { - # type = file - print "[$section]\nSignature Type=file\n"; - print "# DELETE [$section]Inline Signature\n"; - } - } -} - -#loop over all lines to find Identity sections: -while (<>) { - if ( /\[(Identity[^]]*)\]/ ) { - # new group means that we have to process the old group: - if ( $section ne "" ) { process(); } - $section = $1; - %data = (); - next; - } - chomp; - # We need to prevent this script from begin run twice - # since it would set all signatures to 'disabled' then. - # Presence of the Signature Type key is the best indicator. - /^Signature Type/ and exit; - /^Inline Signature=(.*)$/ and $data{'inline'} = $1; - /^Signature File=(.*)$/ and $data{'file'} = $1; - /^UseSignatureFile=(.*)$/ and $data{'usefile'} = $1; -} -#and don't forget to preocess the last group ;-) -if ( $section ne "" ) { process(); } diff --git a/kdepim/kmail/kconf_update/upgrade-transport.pl b/kdepim/kmail/kconf_update/upgrade-transport.pl deleted file mode 100755 index 806a7a35..00000000 --- a/kdepim/kmail/kconf_update/upgrade-transport.pl +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/perl -my (%data); - -#read in all the data and split it up into hashes. -while (<>) { - $data{$1} = $2 if /^([^=]*)=(.*)$/; -} - -# Delete obsolete entries from the [sending mail] section -print "# DELETE Mailer\n"; -print "# DELETE Method\n"; -print "# DELETE Precommand\n"; -print "# DELETE Smtp Host\n"; -print "# DELETE Smtp Password\n"; -print "# DELETE Smtp Port\n"; -print "# DELETE Smtp Username\n"; - -# Write entries to the [Transport 1] section -print "precommand=$data{'Precommand'}\n" if (defined $data{'Precommand'}); -print "port=$data{'Smtp Port'}\n" if (defined $data{'Smtp Port'}); - -if (defined $data{'Method'}) { - if ($data{'Method'} eq "smtp") { - print "type=smtp\n"; - print "host=$data{'Smtp Host'}\n"; - print "name=$data{'Smtp Host'}\n"; - } - else { - print "type=sendmail\n"; - print "host=$data{'Mailer'}\n"; - print "name=Sendmail\n"; - } - print "\n[General]\n"; - print "transports=1\n"; -} - diff --git a/kdepim/kmailcvt/CMakeLists.txt b/kdepim/kmailcvt/CMakeLists.txt index a2ee1385..8c027187 100644 --- a/kdepim/kmailcvt/CMakeLists.txt +++ b/kdepim/kmailcvt/CMakeLists.txt @@ -19,10 +19,7 @@ set(kmailcvt_SRCS include_directories(${Boost_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/mailimporter ${CMAKE_SOURCE_DIR}/mailcommon ${CMAKE_SOURCE_DIR}/messagecomposer) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) -kde4_add_ui_files(kmailcvt_SRCS ui/kselfilterpagedlg.ui ui/kimportpagedlg.ui) - -kde4_add_app_icon(kmailcvt_SRCS "icons/hi*-app-kmailcvt.png") -kde4_add_executable(kmailcvt ${kmailcvt_SRCS}) +add_executable(kmailcvt ${kmailcvt_SRCS}) target_link_libraries(kmailcvt ${KDE4_KIO_LIBS} diff --git a/kdepim/kmailcvt/ui/kimportpagedlg.ui b/kdepim/kmailcvt/kimportpagedlg.ui similarity index 100% rename from kdepim/kmailcvt/ui/kimportpagedlg.ui rename to kdepim/kmailcvt/kimportpagedlg.ui diff --git a/kdepim/kmailcvt/ui/kselfilterpagedlg.ui b/kdepim/kmailcvt/kselfilterpagedlg.ui similarity index 100% rename from kdepim/kmailcvt/ui/kselfilterpagedlg.ui rename to kdepim/kmailcvt/kselfilterpagedlg.ui diff --git a/kdepim/knode/CMakeLists.txt b/kdepim/knode/CMakeLists.txt index 34f2c539..4949b110 100644 --- a/kdepim/knode/CMakeLists.txt +++ b/kdepim/knode/CMakeLists.txt @@ -106,7 +106,7 @@ kde4_add_ui_files(knodecommon_LIB_SRCS kde4_add_kcfg_files(knodecommon_LIB_SRCS settings_base.kcfgc ) -kde4_add_library(knodecommon ${LIBRARY_TYPE} ${knodecommon_LIB_SRCS}) +add_library(knodecommon ${LIBRARY_TYPE} ${knodecommon_LIB_SRCS}) target_link_libraries(knodecommon ${KDEPIMLIBS_KMIME_LIBS} ${KDE4_KCMUTILS_LIBS} ${KDE4_KIO_LIBS} @@ -162,7 +162,7 @@ set(knode_SRCS knode.cpp knapplication.cpp main.cpp ) kde4_add_app_icon(knode_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-knode.png") -kde4_add_executable(knode ${knode_SRCS}) +add_executable(knode ${knode_SRCS}) target_link_libraries(knode ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} kdepim knodecommon) diff --git a/kdepim/knotes/CMakeLists.txt b/kdepim/knotes/CMakeLists.txt index 8d059792..6d1b9398 100644 --- a/kdepim/knotes/CMakeLists.txt +++ b/kdepim/knotes/CMakeLists.txt @@ -1,6 +1,8 @@ project(knotes) add_subdirectory( icons ) -add_subdirectory( tests ) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() add_definitions( -DQT_NO_CAST_FROM_ASCII ) add_definitions( -DQT_NO_CAST_TO_ASCII ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") @@ -47,7 +49,7 @@ set( libknotesprivate_kcfg_lib_SRCS settings/knotesglobalconfig.kcfgc ) kde4_add_kcfg_files(libknotesprivate_kcfg_lib_SRCS ${libknotesprivate_kcfg_lib_SRCS}) -kde4_add_library(knotesprivate ${LIBRARY_TYPE} ${libknotesprivate_lib_SRCS} ${libknotesprivate_kcfg_lib_SRCS} ) +add_library(knotesprivate ${LIBRARY_TYPE} ${libknotesprivate_lib_SRCS} ${libknotesprivate_kcfg_lib_SRCS} ) target_link_libraries(knotesprivate kdepim ${KDE4_KIO_LIBS} pimcommon ${KDE4_KPRINTUTILS_LIBS} ${KDE4_KCMUTILS_LIBS} ${Grantlee_CORE_LIBRARIES} ${KDE4_KDNSSD_LIBS} ${KDE4_KNEWSTUFF3_LIBS} noteshared akonadi_next ${BALOO_LIBRARIES}) @@ -74,9 +76,7 @@ set(knotes_SRCS qt4_add_dbus_adaptor(knotes_SRCS apps/org.kde.KNotes.xml apps/knotesapp.h KNotesApp ) -kde4_add_app_icon(knotes_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-knotes.png") - -kde4_add_executable(knotes ${knotes_SRCS}) +add_executable(knotes ${knotes_SRCS}) target_link_libraries(knotes knotesprivate pimcommon kdepim ${KDE4_KIO_LIBS} ${KDE4_KCMUTILS_LIBS} ${X11_X11_LIB} ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} ${KDE4_KPRINTUTILS_LIBS} ${KDE4_KDNSSD_LIBS} noteshared diff --git a/kdepim/kontact/plugins/korganizer/CMakeLists.txt b/kdepim/kontact/plugins/korganizer/CMakeLists.txt index c748c637..bc814f8d 100644 --- a/kdepim/kontact/plugins/korganizer/CMakeLists.txt +++ b/kdepim/kontact/plugins/korganizer/CMakeLists.txt @@ -38,8 +38,6 @@ target_link_libraries(kontact_journalplugin ${KDE4_KPARTS_LIBS} ${KDEPIMLIBS_KON set(kcm_apptsummary_PART_SRCS kcmapptsummary.cpp) -kde4_add_ui_files(kcm_apptsummary_PART_SRCS apptsummaryconfig_base.ui) - kde4_add_plugin(kcm_apptsummary ${kcm_apptsummary_PART_SRCS}) target_link_libraries(kcm_apptsummary ${KDE4_KDEUI_LIBS} korganizerprivate ${KDEPIMLIBS_KCALUTILS_LIBS}) @@ -48,14 +46,16 @@ target_link_libraries(kcm_apptsummary ${KDE4_KDEUI_LIBS} korganizerprivate ${KDE set(kcm_todosummary_PART_SRCS kcmtodosummary.cpp) -kde4_add_ui_files(kcm_todosummary_PART_SRCS todosummaryconfig_base.ui) kde4_add_plugin(kcm_todosummary ${kcm_todosummary_PART_SRCS}) target_link_libraries(kcm_todosummary ${KDE4_KDEUI_LIBS}) ########## Unit Test ########### -add_subdirectory(tests) + +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() ########### install files ############### diff --git a/kdepim/kontact/plugins/specialdates/CMakeLists.txt b/kdepim/kontact/plugins/specialdates/CMakeLists.txt index 40aaf4fa..4c5469f7 100644 --- a/kdepim/kontact/plugins/specialdates/CMakeLists.txt +++ b/kdepim/kontact/plugins/specialdates/CMakeLists.txt @@ -33,8 +33,6 @@ target_link_libraries(kontact_specialdatesplugin set(kcm_sdsummary_PART_SRCS kcmsdsummary.cpp) -kde4_add_ui_files(kcm_sdsummary_PART_SRCS sdsummaryconfig_base.ui) - kde4_add_plugin(kcm_sdsummary ${kcm_sdsummary_PART_SRCS}) target_link_libraries(kcm_sdsummary ${KDE4_KDEUI_LIBS}) diff --git a/kdepim/kontact/src/CMakeLists.txt b/kdepim/kontact/src/CMakeLists.txt index 1a9902a4..a64b1ff9 100644 --- a/kdepim/kontact/src/CMakeLists.txt +++ b/kdepim/kontact/src/CMakeLists.txt @@ -19,7 +19,7 @@ set(kontactprivate_LIB_SRCS kde4_add_kcfg_files(kontactprivate_LIB_SRCS prefs.kcfgc) -kde4_add_library(kontactprivate ${LIBRARY_TYPE} ${kontactprivate_LIB_SRCS}) +add_library(kontactprivate ${LIBRARY_TYPE} ${kontactprivate_LIB_SRCS}) target_link_libraries(kontactprivate ${KDE4_KCMUTILS_LIBS} @@ -43,9 +43,7 @@ install(TARGETS kontactprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_ set(kontact_bin_SRCS main.cpp) -kde4_add_app_icon(kontact_bin_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-apps-kontact.png") - -kde4_add_executable(kontact_bin ${kontact_bin_SRCS}) +add_executable(kontact_bin ${kontact_bin_SRCS}) set_target_properties(kontact_bin PROPERTIES OUTPUT_NAME kontact) diff --git a/kdepim/korgac/CMakeLists.txt b/kdepim/korgac/CMakeLists.txt index 3897a55d..5900b637 100644 --- a/kdepim/korgac/CMakeLists.txt +++ b/kdepim/korgac/CMakeLists.txt @@ -18,7 +18,9 @@ include_directories( ) add_subdirectory(pixmaps) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() ########### next target ############### @@ -53,23 +55,10 @@ if(RUNTIME_PLUGINS_STATIC) add_definitions(-DSERIALIZER_PLUGIN_STATIC) endif() -kde4_add_app_icon(korgac_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pixmap/hi*-apps-korganizer.png") - if(KORGAC_AKONADI_AGENT) kde4_add_plugin(korgac ${korgac_SRCS}) else() - kde4_add_executable(korgac ${korgac_SRCS}) - if(Q_WS_MAC) - set_target_properties(korgac PROPERTIES - MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist.template - ) - set_target_properties(korgac PROPERTIES - MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.pim.korgac" - ) - set_target_properties(korgac PROPERTIES - MACOSX_BUNDLE_BUNDLE_NAME "KOrganizer Reminder Client" - ) - endif() + add_executable(korgac ${korgac_SRCS}) endif() target_link_libraries(korgac diff --git a/kdepim/korganizer/CMakeLists.txt b/kdepim/korganizer/CMakeLists.txt index 633e9048..b564fff0 100644 --- a/kdepim/korganizer/CMakeLists.txt +++ b/kdepim/korganizer/CMakeLists.txt @@ -25,7 +25,9 @@ include_directories( ${ZLIB_INCLUDE_DIRS} ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() add_subdirectory(interfaces) if(KDEPIM_BUILD_DESKTOP) add_subdirectory(pixmaps) @@ -48,9 +50,7 @@ if(KDEPIM_BUILD_DESKTOP) koapp.cpp ) - kde4_add_app_icon(korganizer_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/hi*-apps-korganizer.png") - - kde4_add_executable(korganizer ${korganizer_SRCS}) + add_executable(korganizer ${korganizer_SRCS}) target_link_libraries(korganizer ${KDE4_KDEUI_LIBS} @@ -140,7 +140,7 @@ set(korganizer_core_LIB_SRCS kde4_add_kcfg_files(korganizer_core_LIB_SRCS koprefs_base.kcfgc) -kde4_add_library(korganizer_core ${LIBRARY_TYPE} ${korganizer_core_LIB_SRCS}) +add_library(korganizer_core ${LIBRARY_TYPE} ${korganizer_core_LIB_SRCS}) target_link_libraries(korganizer_core calendarsupport @@ -213,15 +213,6 @@ set(korganizerprivate_LIB_SRCS kde4_add_kcfg_files(korganizerprivate_LIB_SRCS htmlexportsettings.kcfgc) - kde4_add_ui_files(korganizerprivate_LIB_SRCS - filteredit_base.ui - kogroupwareprefspage.ui - multiagendaviewconfigwidget.ui - publishdialog_base.ui - searchdialog_base.ui - timescaleedit_base.ui - ) - qt4_add_resources(korganizerprivate_LIB_SRCS agendaitem_pixmaps/agendaitemtheme.qrc) @@ -247,7 +238,7 @@ set(korganizerprivate_LIB_SRCS ${CMAKE_SOURCE_DIR}/korganizer/org.kde.korganizer.Korganizer.xml ) - kde4_add_library(korganizerprivate ${LIBRARY_TYPE} ${korganizerprivate_LIB_SRCS}) + add_library(korganizerprivate ${LIBRARY_TYPE} ${korganizerprivate_LIB_SRCS}) target_link_libraries(korganizerprivate pimcommon diff --git a/kdepim/korganizer/interfaces/korganizer/CMakeLists.txt b/kdepim/korganizer/interfaces/korganizer/CMakeLists.txt index e614e704..4fe5e6e4 100644 --- a/kdepim/korganizer/interfaces/korganizer/CMakeLists.txt +++ b/kdepim/korganizer/interfaces/korganizer/CMakeLists.txt @@ -6,7 +6,7 @@ set(korganizer_interfaces_LIB_SRCS mainwindow.cpp ) -kde4_add_library(korganizer_interfaces ${LIBRARY_TYPE} ${korganizer_interfaces_LIB_SRCS}) +add_library(korganizer_interfaces ${LIBRARY_TYPE} ${korganizer_interfaces_LIB_SRCS}) target_link_libraries(korganizer_interfaces akonadi_next diff --git a/kdepim/kresources/blog/CMakeLists.txt b/kdepim/kresources/blog/CMakeLists.txt index a4044d3a..ec42a381 100644 --- a/kdepim/kresources/blog/CMakeLists.txt +++ b/kdepim/kresources/blog/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( set(kcal_resourceblog_LIB_SRCS resourceblog.cpp resourceblogconfig.cpp ) -kde4_add_library(kcal_resourceblog ${LIBRARY_TYPE} ${kcal_resourceblog_LIB_SRCS}) +add_library(kcal_resourceblog ${LIBRARY_TYPE} ${kcal_resourceblog_LIB_SRCS}) target_link_libraries(kcal_resourceblog ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_KBLOG_LIBS} kdepim) diff --git a/kdepim/kresources/remote/CMakeLists.txt b/kdepim/kresources/remote/CMakeLists.txt index a7f30d90..ce8dca81 100644 --- a/kdepim/kresources/remote/CMakeLists.txt +++ b/kdepim/kresources/remote/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( set(kcal_resourceremote_LIB_SRCS resourceremote.cpp resourceremoteconfig.cpp ) -kde4_add_library(kcal_resourceremote ${LIBRARY_TYPE} ${kcal_resourceremote_LIB_SRCS}) +add_library(kcal_resourceremote ${LIBRARY_TYPE} ${kcal_resourceremote_LIB_SRCS}) target_link_libraries(kcal_resourceremote ${KDE4_KDECORE_LIBS} ${KDEPIMLIBS_KCAL_LIBS} kdepim ) diff --git a/kdepim/ksendemail/CMakeLists.txt b/kdepim/ksendemail/CMakeLists.txt index d78f818d..90ffd7bb 100644 --- a/kdepim/ksendemail/CMakeLists.txt +++ b/kdepim/ksendemail/CMakeLists.txt @@ -8,7 +8,7 @@ if(KMAIL_SUPPORTED) qt4_add_dbus_interfaces( ksendemail_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml ) - kde4_add_executable( ksendemail ${ksendemail_SRCS}) + add_executable( ksendemail ${ksendemail_SRCS}) add_dependencies( ksendemail kmail_xml ) target_link_libraries( ksendemail ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ) diff --git a/kdepim/ktimetracker/CMakeLists.txt b/kdepim/ktimetracker/CMakeLists.txt index bf7b0ef4..42795d2f 100644 --- a/kdepim/ktimetracker/CMakeLists.txt +++ b/kdepim/ktimetracker/CMakeLists.txt @@ -44,23 +44,13 @@ qt4_add_dbus_adaptor( ktimetracker_shared_SRCS storageadaptor StorageAdaptor ) -kde4_add_ui_files( ktimetracker_shared_SRCS - csvexportdialog_base.ui - historydialog.ui - edittaskdialog.ui - cfgbehavior.ui - cfgdisplay.ui - cfgstorage.ui ) - kde4_add_kcfg_files( ktimetracker_shared_SRCS ktimetracker.kcfgc ) set(ktimetracker_SRCS main.cpp ${ktimetracker_shared_SRCS}) -kde4_add_executable(karm karm.cpp) +add_executable(karm karm.cpp) -kde4_add_app_icon(ktimetracker_SRCS "hi*-app-ktimetracker.png") - -kde4_add_executable(ktimetracker ${ktimetracker_SRCS}) +add_executable(ktimetracker ${ktimetracker_SRCS}) target_link_libraries(karm ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS} ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} ) diff --git a/kdepim/ktimetracker/new/CMakeLists.txt b/kdepim/ktimetracker/new/CMakeLists.txt index f501f24b..54c39f41 100644 --- a/kdepim/ktimetracker/new/CMakeLists.txt +++ b/kdepim/ktimetracker/new/CMakeLists.txt @@ -57,11 +57,11 @@ kde4_add_kcfg_files( ktimetracker_shared_SRCS ktimetracker.kcfgc ) set(ktimetracker_SRCS main.cpp ${ktimetracker_shared_SRCS}) -kde4_add_executable(karm karm.cpp) +add_executable(karm karm.cpp) kde4_add_app_icon(ktimetracker_SRCS "hi*-app-ktimetracker.png") -kde4_add_executable(ktimetracker ${ktimetracker_SRCS}) +add_executable(ktimetracker ${ktimetracker_SRCS}) target_link_libraries(karm ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} kcal_resourceremote) diff --git a/kdepim/ktnef/CMakeLists.txt b/kdepim/ktnef/CMakeLists.txt index aeacc5c3..3665d8ec 100644 --- a/kdepim/ktnef/CMakeLists.txt +++ b/kdepim/ktnef/CMakeLists.txt @@ -18,11 +18,7 @@ set(ktnef_SRCS qwmf.cpp ) -kde4_add_app_icon(ktnef_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-app-ktnef.png") - -kde4_add_ui_files(ktnef_SRCS ui/attachpropertywidgetbase.ui) - -kde4_add_executable(ktnef ${ktnef_SRCS}) +add_executable(ktnef ${ktnef_SRCS}) target_link_libraries(ktnef ${KDEPIMLIBS_KTNEF_LIBS} ${KDE4_KIO_LIBS}) diff --git a/kdepim/ktnef/ui/attachpropertywidgetbase.ui b/kdepim/ktnef/attachpropertywidgetbase.ui similarity index 100% rename from kdepim/ktnef/ui/attachpropertywidgetbase.ui rename to kdepim/ktnef/attachpropertywidgetbase.ui diff --git a/kdepim/libkdepim/CMakeLists.txt b/kdepim/libkdepim/CMakeLists.txt index 346f0f8c..a39452b4 100644 --- a/kdepim/libkdepim/CMakeLists.txt +++ b/kdepim/libkdepim/CMakeLists.txt @@ -6,7 +6,10 @@ add_definitions( -DQT_NO_CAST_FROM_ASCII ) add_definitions( -DQT_NO_CAST_TO_ASCII ) -add_subdirectory(tests) + +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() add_subdirectory(pics) add_definitions(${QT_QTDBUS_DEFINITIONS}) @@ -92,7 +95,7 @@ if (KDEPIM_INPROCESS_LDAP) ) endif () -kde4_add_library(kdepim ${LIBRARY_TYPE} ${kdepim_LIB_SRCS}) +add_library(kdepim ${LIBRARY_TYPE} ${kdepim_LIB_SRCS}) target_link_libraries(kdepim ${KDEPIMLIBS_KRESOURCES_LIBS} @@ -122,10 +125,6 @@ target_link_libraries(kdepim LINK_INTERFACE_LIBRARIES ${KDEPIMLIBS_AKONADI_CONTACT_LIBS} ) -if(MINGW) - target_link_libraries(kdepim oleaut32) -endif() - set_target_properties(kdepim PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) install(TARGETS kdepim ${INSTALL_TARGETS_DEFAULT_ARGS}) @@ -133,10 +132,9 @@ install(TARGETS kdepim ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### next target ############### if (QT_QTDESIGNER_FOUND) - set(kdepimwidgets_PART_SRCS) - kde4_add_widget_files(kdepimwidgets_PART_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/designer/kdepim.widgets) + kde4_add_widget_files(${CMAKE_CURRENT_SOURCE_DIR}/designer/kdepim.widgets) - kde4_add_plugin(kdepimwidgets ${kdepimwidgets_PART_SRCS}) + kde4_add_plugin(kdepimwidgets $) target_link_libraries(kdepimwidgets ${KDE4_KIO_LIBS} kdepim) diff --git a/kdepim/libkdepimdbusinterfaces/CMakeLists.txt b/kdepim/libkdepimdbusinterfaces/CMakeLists.txt index 5543713f..3525b188 100644 --- a/kdepim/libkdepimdbusinterfaces/CMakeLists.txt +++ b/kdepim/libkdepimdbusinterfaces/CMakeLists.txt @@ -19,7 +19,7 @@ qt4_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_SOURCE_DIR}/korga qt4_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.kmail.xml) qt4_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_SOURCE_DIR}/knode/org.kde.knode.xml) -kde4_add_library(kdepimdbusinterfaces ${LIBRARY_TYPE} ${kdepimdbusinterfaces_LIB_SRCS}) +add_library(kdepimdbusinterfaces ${LIBRARY_TYPE} ${kdepimdbusinterfaces_LIB_SRCS}) add_dependencies(kdepimdbusinterfaces kmail_xml) diff --git a/kdepim/libkleo/CMakeLists.txt b/kdepim/libkleo/CMakeLists.txt index 6fa912f4..5b583984 100644 --- a/kdepim/libkleo/CMakeLists.txt +++ b/kdepim/libkleo/CMakeLists.txt @@ -15,7 +15,9 @@ set(CMAKE_CXX_FLAGS "${FOO}") add_subdirectory( pics ) add_subdirectory( backends ) -add_subdirectory( tests ) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() ########### next target ############### set(libkleo_backend_qgpgme_SRCS @@ -93,10 +95,6 @@ set(libkleo_ui_SRCS # make this a separate lib. ui/keyapprovaldialog.cpp ) -kde4_add_ui_files(libkleo_ui_common_SRCS - ui/directoryserviceswidget.ui -) - set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backend_qgpgme_SRCS}) set(kleo_LIB_LIBS ${KDE4_KDEUI_LIBS} ${QGPGME_LIBRARIES}) if ( NOT KDEPIM_ONLY_KLEO ) @@ -104,17 +102,9 @@ if ( NOT KDEPIM_ONLY_KLEO ) set( kleo_LIB_LIBS ${kleo_LIB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS}) endif () -kde4_add_library(kleo ${LIBRARY_TYPE} ${kleo_LIB_SRCS}) -if(WIN32) -target_link_libraries(kleo ${kleo_LIB_LIBS} ${GPGME_VANILLA_LIBRARIES} ) -else() +add_library(kleo ${LIBRARY_TYPE} ${kleo_LIB_SRCS}) target_link_libraries(kleo ${kleo_LIB_LIBS} ) -endif() set_target_properties(kleo PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS}) -if ( WIN32 ) -install ( FILES libkleopatrarc-win32.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc ) -else () install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc ) -endif () diff --git a/kdepim/libkpgp/CMakeLists.txt b/kdepim/libkpgp/CMakeLists.txt index 4be58ba4..2837bef8 100644 --- a/kdepim/libkpgp/CMakeLists.txt +++ b/kdepim/libkpgp/CMakeLists.txt @@ -21,14 +21,16 @@ set(kpgp_LIB_SRCS kpgpbase6.cpp ) -kde4_add_library(kpgp ${LIBRARY_TYPE} ${kpgp_LIB_SRCS}) +add_library(kpgp ${LIBRARY_TYPE} ${kpgp_LIB_SRCS}) target_link_libraries(kpgp ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY}) set_target_properties(kpgp PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) install(TARGETS kpgp ${INSTALL_TARGETS_DEFAULT_ARGS}) -add_subdirectory( tests ) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() ########### install files ############### diff --git a/kdepim/libksieve/CMakeLists.txt b/kdepim/libksieve/CMakeLists.txt index cb95c674..c6e77c2a 100644 --- a/kdepim/libksieve/CMakeLists.txt +++ b/kdepim/libksieve/CMakeLists.txt @@ -12,7 +12,9 @@ set(libksieve_parser_SRCS add_subdirectory(ksieve) add_subdirectory(kmanagesieve) add_subdirectory(ksieveui) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() ########### next target ############### @@ -21,7 +23,7 @@ set(ksieve_LIB_SRCS ${libksieve_parser_SRCS} ) -kde4_add_library(ksieve ${LIBRARY_TYPE} ${ksieve_LIB_SRCS}) +add_library(ksieve ${LIBRARY_TYPE} ${ksieve_LIB_SRCS}) target_link_libraries(ksieve ${KDE4_KDECORE_LIBS}) diff --git a/kdepim/libksieve/kmanagesieve/CMakeLists.txt b/kdepim/libksieve/kmanagesieve/CMakeLists.txt index c0d17f85..d8223811 100644 --- a/kdepim/libksieve/kmanagesieve/CMakeLists.txt +++ b/kdepim/libksieve/kmanagesieve/CMakeLists.txt @@ -9,7 +9,7 @@ set(kmanagesieve_LIB_SRCS sievejob.cpp ) -kde4_add_library(kmanagesieve ${LIBRARY_TYPE} ${kmanagesieve_LIB_SRCS}) +add_library(kmanagesieve ${LIBRARY_TYPE} ${kmanagesieve_LIB_SRCS}) target_link_libraries(kmanagesieve ${KDE4_KDECORE_LIBS} diff --git a/kdepim/libksieve/ksieveui/CMakeLists.txt b/kdepim/libksieve/ksieveui/CMakeLists.txt index 441bb474..8bc6541f 100644 --- a/kdepim/libksieve/ksieveui/CMakeLists.txt +++ b/kdepim/libksieve/ksieveui/CMakeLists.txt @@ -18,9 +18,15 @@ include_directories(${CMAKE_SOURCE_DIR}/libksieve ${CMAKE_SOURCE_DIR}/libkdepim/ ) -add_subdirectory(tests) -add_subdirectory(editor/tests) -add_subdirectory(managescriptsjob/tests) +if(ENABLE_TESTING) + add_subdirectory(tests) + add_subdirectory(editor/tests) + add_subdirectory(managescriptsjob/tests) + add_subdirectory(autocreatescripts/tests) + add_subdirectory(scriptsparsing/tests) + add_subdirectory(vacation/tests) +endif() + set(ksieveui_vacation_LIB_SRCS vacation/vacation.cpp vacation/vacationdialog.cpp @@ -168,7 +174,7 @@ set(ksieveui_LIB_SRCS kde4_add_kcfg_files(ksieveui_LIB_SRCS settings/sieve-vacation.kcfgc settings/sieve-editor.kcfgc) -kde4_add_library(ksieveui ${LIBRARY_TYPE} ${ksieveui_LIB_SRCS}) +add_library(ksieveui ${LIBRARY_TYPE} ${ksieveui_LIB_SRCS}) target_link_libraries(ksieveui kmanagesieve @@ -195,7 +201,4 @@ install(TARGETS ksieveui ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES data/ksieve_script.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) install(DIRECTORY data/scripts/ DESTINATION ${DATA_INSTALL_DIR}/sieve/scripts/ ) -add_subdirectory(autocreatescripts/tests) -add_subdirectory(scriptsparsing/tests) -add_subdirectory(vacation/tests) diff --git a/kdepim/mailcommon/CMakeLists.txt b/kdepim/mailcommon/CMakeLists.txt index c7596744..4b867b37 100644 --- a/kdepim/mailcommon/CMakeLists.txt +++ b/kdepim/mailcommon/CMakeLists.txt @@ -170,8 +170,6 @@ qt4_add_dbus_interfaces(libmailcommon_SRCS ${CMAKE_SOURCE_DIR}/agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml ) -kde4_add_ui_files(libmailcommon_SRCS filter/ui/filterconfigwidget.ui snippets/ui/snippetdialog.ui filter/ui/selectthunderbirdfilterfileswidget.ui) - set(libmailcommon_SRCS ${libmailcommon_SRCS} filter/soundtestwidget.cpp) macro(add_resource_iface _kcfgFile _ifaceName _className) @@ -189,7 +187,7 @@ qt4_add_dbus_interfaces(libmailcommon_SRCS ${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml ) -kde4_add_library(mailcommon ${LIBRARY_TYPE} ${libmailcommon_SRCS}) +add_library(mailcommon ${LIBRARY_TYPE} ${libmailcommon_SRCS}) target_link_libraries(mailcommon messageviewer messagecore messagecomposer mailimporter templateparser @@ -209,20 +207,20 @@ target_link_libraries(mailcommon incidenceeditorsng ) -add_subdirectory(widgets/tests/) +if(ENABLE_TESTING) + add_subdirectory(widgets/tests) + add_subdirectory(filter/filterimporter/tests) +endif() set_target_properties(mailcommon PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) install(TARGETS mailcommon ${INSTALL_TARGETS_DEFAULT_ARGS}) -add_subdirectory(filter/filterimporter/tests) - #install(FILES viewer/viewer.h viewer/attachmentstrategy.h header/headerstrategy.h messageviewer_export.h DESTINATION ${INCLUDE_INSTALL_DIR}/messageviewer COMPONENT devel) if (QT_QTDESIGNER_FOUND) - set(mailcommonwidgets_PART_SRCS) - kde4_add_widget_files(mailcommonwidgets_PART_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/designer/mailcommon.widgets) + kde4_add_widget_files(${CMAKE_CURRENT_SOURCE_DIR}/designer/mailcommon.widgets) - kde4_add_plugin(mailcommonwidgets ${mailcommonwidgets_PART_SRCS}) + kde4_add_plugin(mailcommonwidgets $ ${mailcommonwidgets_PART_SRCS}) target_link_libraries(mailcommonwidgets ${KDE4_KIO_LIBS} mailcommon) diff --git a/kdepim/mailimporter/CMakeLists.txt b/kdepim/mailimporter/CMakeLists.txt index 5cf4849c..c7e0ef07 100644 --- a/kdepim/mailimporter/CMakeLists.txt +++ b/kdepim/mailimporter/CMakeLists.txt @@ -30,9 +30,7 @@ set(libmailimporter_SRCS include_directories(${Boost_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/libkdepim) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) -kde4_add_ui_files(libmailimporter_SRCS ui/importmailswidget.ui ui/selectthunderbirdprofilewidget.ui) - -kde4_add_library(mailimporter ${LIBRARY_TYPE} ${libmailimporter_SRCS}) +add_library(mailimporter ${LIBRARY_TYPE} ${libmailimporter_SRCS}) target_link_libraries(mailimporter ${KDE4_KIO_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} diff --git a/kdepim/mailimporter/ui/importmailswidget.ui b/kdepim/mailimporter/importmailswidget.ui similarity index 100% rename from kdepim/mailimporter/ui/importmailswidget.ui rename to kdepim/mailimporter/importmailswidget.ui diff --git a/kdepim/mailimporter/ui/selectthunderbirdprofilewidget.ui b/kdepim/mailimporter/selectthunderbirdprofilewidget.ui similarity index 100% rename from kdepim/mailimporter/ui/selectthunderbirdprofilewidget.ui rename to kdepim/mailimporter/selectthunderbirdprofilewidget.ui diff --git a/kdepim/mboximporter/CMakeLists.txt b/kdepim/mboximporter/CMakeLists.txt index 147902f1..eaadc33c 100644 --- a/kdepim/mboximporter/CMakeLists.txt +++ b/kdepim/mboximporter/CMakeLists.txt @@ -10,14 +10,10 @@ set(mboximporter_SRCS mboximportkernel.cpp ) -kde4_add_ui_files(mboximporter_SRCS - ui/mboximportwidget.ui -) - include_directories(${Boost_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/mailimporter ${CMAKE_SOURCE_DIR}/mailcommon ${CMAKE_SOURCE_DIR}/messagecomposer) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) -kde4_add_executable(mboximporter ${mboximporter_SRCS}) +add_executable(mboximporter ${mboximporter_SRCS}) target_link_libraries(mboximporter ${KDE4_KIO_LIBS} diff --git a/kdepim/mboximporter/ui/mboximportwidget.ui b/kdepim/mboximporter/mboximportwidget.ui similarity index 100% rename from kdepim/mboximporter/ui/mboximportwidget.ui rename to kdepim/mboximporter/mboximportwidget.ui diff --git a/kdepim/messagecomposer/CMakeLists.txt b/kdepim/messagecomposer/CMakeLists.txt index 187fbae2..3e16631c 100644 --- a/kdepim/messagecomposer/CMakeLists.txt +++ b/kdepim/messagecomposer/CMakeLists.txt @@ -17,7 +17,10 @@ include_directories( add_definitions( -DQT_NO_CAST_FROM_ASCII ) add_definitions( -DQT_NO_CAST_TO_ASCII ) -add_subdirectory( tests ) +if(ENABLE_TESTING) + add_subdirectory(tests) + add_subdirectory(imagescaling/tests) +endif() include_directories(${Grantlee_INCLUDE_DIRS}) @@ -90,10 +93,6 @@ set( messagecomposer_src settings/messagecomposersettings.cpp ) -kde4_add_ui_files(messagecomposer_src - imagescaling/ui/imagescalingwidget.ui -) - if(KDEPIM_ENTERPRISE_BUILD) set(WARN_TOOMANY_RECIPIENTS_DEFAULT true) @@ -109,7 +108,7 @@ kde4_add_kcfg_files(messagecomposer_src settings/messagecomposersettings_base.kcfgc ) -kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} ) +add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} ) target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon) @@ -117,5 +116,3 @@ set_target_properties( messagecomposer PROPERTIES VERSION ${GENERIC_LIB_VERSION} install( TARGETS messagecomposer ${INSTALL_TARGETS_DEFAULT_ARGS} ) -add_subdirectory(imagescaling/tests) - diff --git a/kdepim/messagecore/CMakeLists.txt b/kdepim/messagecore/CMakeLists.txt index 1bd3a494..9c912fb9 100644 --- a/kdepim/messagecore/CMakeLists.txt +++ b/kdepim/messagecore/CMakeLists.txt @@ -5,7 +5,9 @@ add_definitions( -DQT_NO_CAST_TO_ASCII ) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5300) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() include_directories( ${Boost_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/pimcommon @@ -54,12 +56,7 @@ kde4_add_kcfg_files(messagecore_LIB_SRCS settings/globalsettings_base.kcfgc ) -kde4_add_ui_files(messagecore_LIB_SRCS - attachment/ui/attachmentpropertiesdialog.ui - attachment/ui/attachmentpropertiesdialog_readonly.ui -) - -kde4_add_library(messagecore ${LIBRARY_TYPE} ${messagecore_LIB_SRCS}) +add_library(messagecore ${LIBRARY_TYPE} ${messagecore_LIB_SRCS}) target_link_libraries(messagecore ${KDEPIMLIBS_KMIME_LIBS} diff --git a/kdepim/messagelist/CMakeLists.txt b/kdepim/messagelist/CMakeLists.txt index c652f67f..3588bbba 100644 --- a/kdepim/messagelist/CMakeLists.txt +++ b/kdepim/messagelist/CMakeLists.txt @@ -15,7 +15,9 @@ include_directories( add_subdirectory(pics) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() set(libmessagelist_SRCS core/aggregation.cpp @@ -87,7 +89,7 @@ kde4_add_kcfg_files(libmessagelist_SRCS USE_RELATIVE_PATH core/settings.kcfgc ) -kde4_add_library(messagelist ${LIBRARY_TYPE} ${libmessagelist_SRCS}) +add_library(messagelist ${LIBRARY_TYPE} ${libmessagelist_SRCS}) target_link_libraries(messagelist ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} diff --git a/kdepim/messageviewer/CMakeLists.txt b/kdepim/messageviewer/CMakeLists.txt index 5a6be3e3..86e7beb0 100644 --- a/kdepim/messageviewer/CMakeLists.txt +++ b/kdepim/messageviewer/CMakeLists.txt @@ -28,7 +28,13 @@ macro_bool_to_01(SYS_INOTIFY_H_FOUND HAVE_SYS_INOTIFY_H) configure_file(config-messageviewer.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-messageviewer.h) add_subdirectory(about) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) + add_subdirectory(grantleefilters) + add_subdirectory(scamdetection/tests) + add_subdirectory(adblock/tests/) + add_subdirectory(findbar/tests) +endif() add_subdirectory(pics) if(DEBUG_SIGNATURE) @@ -177,16 +183,7 @@ kde4_add_kcfg_files(libmessageviewer_SRCS settings/globalsettings_base.kcfgc ) -kde4_add_ui_files(libmessageviewer_SRCS - ui/settings.ui - ui/invitationsettings.ui - ui/printingsettings.ui - adblock/ui/settings_adblock.ui - adblock/ui/adblockcreatefilterwidget.ui -) - - -kde4_add_library(messageviewer ${LIBRARY_TYPE} ${libmessageviewer_SRCS}) +add_library(messageviewer ${LIBRARY_TYPE} ${libmessageviewer_SRCS}) target_link_libraries(messageviewer messagecore kdepim kpgp kleo ${KDEPIMLIBS_KMIME_LIBS} @@ -231,9 +228,5 @@ install(DIRECTORY themes DESTINATION ${DATA_INSTALL_DIR}/messageviewer ) install(FILES header/data/messageviewer_header_themes.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) -add_subdirectory(grantleefilters) -add_subdirectory(scamdetection/tests) -add_subdirectory(adblock/tests/) -add_subdirectory(findbar/tests) install(FILES notify/messageviewer.notifyrc DESTINATION ${DATA_INSTALL_DIR}/messageviewer ) install(FILES scamdetection/data/longurlServices.json DESTINATION ${DATA_INSTALL_DIR}/messageviewer ) diff --git a/kdepim/messageviewer/a11y/CMakeLists.txt b/kdepim/messageviewer/a11y/CMakeLists.txt index 3b5559f3..226dbbce 100644 --- a/kdepim/messageviewer/a11y/CMakeLists.txt +++ b/kdepim/messageviewer/a11y/CMakeLists.txt @@ -20,4 +20,6 @@ target_link_libraries(messagevieweraccessiblewidgetfactory install(TARGETS messagevieweraccessiblewidgetfactory DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/accessible) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdepim/noteshared/CMakeLists.txt b/kdepim/noteshared/CMakeLists.txt index 52964c28..c7b3d2c8 100644 --- a/kdepim/noteshared/CMakeLists.txt +++ b/kdepim/noteshared/CMakeLists.txt @@ -60,8 +60,7 @@ set( libnoteshared_kcfg_lib_SRCS settings/notesharedglobalconfig.kcfgc ) kde4_add_kcfg_files(libnoteshared_kcfg_lib_SRCS ${libnoteshared_kcfg_lib_SRCS}) - -kde4_add_library(noteshared ${LIBRARY_TYPE} ${libnoteshared_SRCS} ${libnoteshared_kcfg_lib_SRCS} ) +add_library(noteshared ${LIBRARY_TYPE} ${libnoteshared_SRCS} ${libnoteshared_kcfg_lib_SRCS} ) target_link_libraries(noteshared ${KDEPIMLIBS_AKONADI_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDNSSD_LIBS} pimcommon akonadi_next ${KDEPIMLIBS_KMIME_LIBS} @@ -70,4 +69,6 @@ target_link_libraries(noteshared set_target_properties(noteshared PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) install(TARGETS noteshared ${INSTALL_TARGETS_DEFAULT_ARGS}) -add_subdirectory(attributes/tests) +if(ENABLE_TESTING) + add_subdirectory(attributes/tests) +endif() diff --git a/kdepim/pimcommon/CMakeLists.txt b/kdepim/pimcommon/CMakeLists.txt index e6771685..4b1cd11d 100644 --- a/kdepim/pimcommon/CMakeLists.txt +++ b/kdepim/pimcommon/CMakeLists.txt @@ -196,11 +196,6 @@ set(libpimcommon_SRCS ) -kde4_add_ui_files(libpimcommon_SRCS - autocorrection/ui/autocorrectionwidget.ui - widgets/ui/manageaccountwidget.ui -) - macro(add_resource_iface _kcfgFile _ifaceName _className _fileName) kcfg_generate_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/${_kcfgFile} ${_ifaceName}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_ifaceName}.xml PROPERTIES INCLUDE "metatype.h") @@ -215,7 +210,7 @@ kde4_add_kcfg_files(libpimcommon_SRCS settings/pimcommonsetting_base.kcfgc ) -kde4_add_library(pimcommon ${LIBRARY_TYPE} ${libpimcommon_SRCS}) +add_library(pimcommon ${LIBRARY_TYPE} ${libpimcommon_SRCS}) if( LibKGAPI2_FOUND ) target_link_libraries(pimcommon @@ -241,34 +236,37 @@ target_link_libraries(pimcommon set_target_properties(pimcommon PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) install(TARGETS pimcommon ${INSTALL_TARGETS_DEFAULT_ARGS}) -add_subdirectory(translator/tests) -add_subdirectory(texteditor/plaintexteditor/tests) -add_subdirectory(texteditor/richtexteditor/tests) -add_subdirectory(texteditor/commonwidget/tests/) -add_subdirectory(widgets/tests) -add_subdirectory(shorturl/tests) -add_subdirectory(autocorrection/tests) -add_subdirectory(folderdialog/tests/) -add_subdirectory(storageservice/dropbox/tests) -add_subdirectory(storageservice/hubic/tests) -add_subdirectory(storageservice/tests) -add_subdirectory(storageservice/yousendit/tests) -add_subdirectory(storageservice/webdav/tests) -add_subdirectory(storageservice/box/tests) -add_subdirectory(storageservice/dropbox/icons/) -add_subdirectory(baloodebug/autotests) -add_subdirectory(baloodebug/tests) +if(ENABLE_TESTING) + add_subdirectory(translator/tests) + add_subdirectory(texteditor/plaintexteditor/tests) + add_subdirectory(texteditor/richtexteditor/tests) + add_subdirectory(texteditor/commonwidget/tests/) + add_subdirectory(widgets/tests) + add_subdirectory(shorturl/tests) + add_subdirectory(autocorrection/tests) + add_subdirectory(folderdialog/tests/) + add_subdirectory(storageservice/dropbox/tests) + add_subdirectory(storageservice/hubic/tests) + add_subdirectory(storageservice/tests) + add_subdirectory(storageservice/yousendit/tests) + add_subdirectory(storageservice/webdav/tests) + add_subdirectory(storageservice/box/tests) + add_subdirectory(storageservice/dropbox/icons/) + add_subdirectory(baloodebug/autotests) + add_subdirectory(baloodebug/tests) +endif() if( LibKGAPI2_FOUND ) -add_subdirectory(storageservice/gdrive/tests/) -add_subdirectory(storageservice/gdrive/icons/) + if(ENABLE_TESTING) + add_subdirectory(storageservice/gdrive/tests/) + endif() + add_subdirectory(storageservice/gdrive/icons/) endif() if (QT_QTDESIGNER_FOUND) - set(pimcommonwidgets_PART_SRCS) - kde4_add_widget_files(pimcommonwidgets_PART_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/designer/pimcommon.widgets) + kde4_add_widget_files(${CMAKE_CURRENT_SOURCE_DIR}/designer/pimcommon.widgets) - kde4_add_plugin(pimcommonwidgets ${pimcommonwidgets_PART_SRCS}) + kde4_add_plugin(pimcommonwidgets $ ${pimcommonwidgets_PART_SRCS}) target_link_libraries(pimcommonwidgets ${KDE4_KIO_LIBS} pimcommon) diff --git a/kdepim/pimprint/calendar/CMakeLists.txt b/kdepim/pimprint/calendar/CMakeLists.txt index c1c1a986..a3fc2171 100644 --- a/kdepim/pimprint/calendar/CMakeLists.txt +++ b/kdepim/pimprint/calendar/CMakeLists.txt @@ -14,7 +14,7 @@ set(pimprint_calendar_LIB_SRCS calprintweek.cpp ) -kde4_add_library(pimprint_calendar ${LIBRARY_TYPE} ${pimprint_calendar_LIB_SRCS}) +add_library(pimprint_calendar ${LIBRARY_TYPE} ${pimprint_calendar_LIB_SRCS}) target_link_libraries(pimprint_calendar calendarsupport diff --git a/kdepim/pimsettingexporter/CMakeLists.txt b/kdepim/pimsettingexporter/CMakeLists.txt index 19de5451..3fb025b8 100644 --- a/kdepim/pimsettingexporter/CMakeLists.txt +++ b/kdepim/pimsettingexporter/CMakeLists.txt @@ -100,7 +100,7 @@ set(pimsettingexporter_SRCS set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) -kde4_add_executable(pimsettingexporter ${pimsettingexporter_SRCS}) +add_executable(pimsettingexporter ${pimsettingexporter_SRCS}) target_link_libraries(pimsettingexporter ${KDE4_KFILE_LIBS} @@ -135,4 +135,6 @@ install(PROGRAMS pimsettingexporter.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) ########### install files ############### kde4_install_icons( ${ICON_INSTALL_DIR} ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdepim/plugins/messageviewer/bodypartformatter/CMakeLists.txt b/kdepim/plugins/messageviewer/bodypartformatter/CMakeLists.txt index c96071f2..b8330921 100644 --- a/kdepim/plugins/messageviewer/bodypartformatter/CMakeLists.txt +++ b/kdepim/plugins/messageviewer/bodypartformatter/CMakeLists.txt @@ -25,8 +25,6 @@ qt4_add_dbus_interfaces(messageviewer_bodypartformatter_text_calendar_PART_SRCS ${CMAKE_SOURCE_DIR}/korganizer/org.kde.Korganizer.Calendar.xml ) -kde4_add_ui_files(messageviewer_bodypartformatter_text_calendar_PART_SRCS attendeeselector.ui) - kde4_add_plugin(messageviewer_bodypartformatter_text_calendar ${messageviewer_bodypartformatter_text_calendar_PART_SRCS}) diff --git a/kdepim/sieveeditor/CMakeLists.txt b/kdepim/sieveeditor/CMakeLists.txt index 793c19f4..7d001805 100644 --- a/kdepim/sieveeditor/CMakeLists.txt +++ b/kdepim/sieveeditor/CMakeLists.txt @@ -35,13 +35,7 @@ set(sieveeditor_SRCS sieveeditorconfigureserverpage.cpp ) -kde4_add_ui_files(sieveeditor_SRCS - ui/serversievesettings.ui - ui/sieveeditorconfigureserverwidget.ui -) - - -kde4_add_executable(sieveeditor ${sieveeditor_SRCS} ) +add_executable(sieveeditor ${sieveeditor_SRCS} ) TARGET_LINK_LIBRARIES(sieveeditor ${KDE4_KDEUI_LIBS} ${KDE4_KNEWSTUFF3_LIBS} diff --git a/kdepim/sieveeditor/ui/serversievesettings.ui b/kdepim/sieveeditor/serversievesettings.ui similarity index 100% rename from kdepim/sieveeditor/ui/serversievesettings.ui rename to kdepim/sieveeditor/serversievesettings.ui diff --git a/kdepim/sieveeditor/ui/sieveeditorconfigureserverwidget.ui b/kdepim/sieveeditor/sieveeditorconfigureserverwidget.ui similarity index 100% rename from kdepim/sieveeditor/ui/sieveeditorconfigureserverwidget.ui rename to kdepim/sieveeditor/sieveeditorconfigureserverwidget.ui diff --git a/kdepim/storageservicemanager/CMakeLists.txt b/kdepim/storageservicemanager/CMakeLists.txt index c77998da..511f0511 100644 --- a/kdepim/storageservicemanager/CMakeLists.txt +++ b/kdepim/storageservicemanager/CMakeLists.txt @@ -30,7 +30,7 @@ set(storageservicemanager_SRCS storageserviceconfigurestoragewidget.cpp ) -kde4_add_executable(storageservicemanager ${storageservicemanager_SRCS} ) +add_executable(storageservicemanager ${storageservicemanager_SRCS} ) TARGET_LINK_LIBRARIES(storageservicemanager ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} @@ -53,4 +53,6 @@ install(FILES data/storageservicemanager.notifyrc ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif() diff --git a/kdepim/templateparser/CMakeLists.txt b/kdepim/templateparser/CMakeLists.txt index e589b858..de439ea5 100644 --- a/kdepim/templateparser/CMakeLists.txt +++ b/kdepim/templateparser/CMakeLists.txt @@ -32,12 +32,7 @@ kde4_add_kcfg_files(templateparser_LIB_SRCS settings/globalsettings_base.kcfgc ) -kde4_add_ui_files(templateparser_LIB_SRCS - ui/templatesconfiguration_base.ui - ui/customtemplates_base.ui -) - -kde4_add_library(templateparser ${LIBRARY_TYPE} ${templateparser_LIB_SRCS}) +add_library(templateparser ${LIBRARY_TYPE} ${templateparser_LIB_SRCS}) target_link_libraries(templateparser messageviewer ${KDE4_KIO_LIBS} @@ -65,4 +60,6 @@ install(FILES DESTINATION ${KCFG_INSTALL_DIR} ) -add_subdirectory(tests) +if(ENABLE_TESTING) + add_subdirectory(tests) +endif()