From 72a3d44af2af1828d8ebeff2157ec3684e59d162 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 25 Sep 2015 08:57:15 +0000 Subject: [PATCH] kdepim: adjust to recent changes --- kdepim/CMakeLists.txt | 98 +++++++++++++++---- kdepim/composereditor-ng/CMakeLists.txt | 2 - .../spellplugin/kspellplugin.cpp | 2 - .../accountspagereceivingtab.ui | 0 .../composercryptoconfiguration.ui | 0 .../configuredialog/customtemplates_base.ui | 1 + .../miscpagemaintab.ui | 0 .../securitypagegeneraltab.ui | 0 .../securitypagemdntab.ui | 0 .../smimeconfiguration.ui | 0 .../warningconfiguration.ui | 0 kdepim/kmail/{ui => identity}/identitypage.ui | 0 .../{ui => searchdialog}/searchwindow.ui | 0 kdepim/libkdepim/CMakeLists.txt | 5 +- .../addressline/addresseelineedit.cpp | 4 + .../selectthunderbirdfilterfileswidget.ui | 0 .../filter/{ui => }/filterconfigwidget.ui | 0 .../snippets/{ui => }/snippetdialog.ui | 0 .../{ui => }/imagescalingwidget.ui | 0 .../{ui => }/attachmentpropertiesdialog.ui | 0 .../attachmentpropertiesdialog_readonly.ui | 0 .../{ui => }/adblockcreatefilterwidget.ui | 0 .../adblock/{ui => }/settings_adblock.ui | 0 .../{ui => settings}/settings.ui | 0 .../{ui => widgets}/invitationsettings.ui | 0 .../{ui => widgets}/printingsettings.ui | 0 kdepim/messageviewer/widgets/settings.ui | 1 + .../autocorrection/autocorrectionwidget.cpp | 1 + .../widgets/{ui => }/manageaccountwidget.ui | 0 .../{ui => }/customtemplates_base.ui | 0 .../{ui => }/templatesconfiguration_base.ui | 0 31 files changed, 89 insertions(+), 25 deletions(-) rename kdepim/kmail/{ui => configuredialog}/accountspagereceivingtab.ui (100%) rename kdepim/kmail/{ui => configuredialog}/composercryptoconfiguration.ui (100%) create mode 120000 kdepim/kmail/configuredialog/customtemplates_base.ui rename kdepim/kmail/{ui => configuredialog}/miscpagemaintab.ui (100%) rename kdepim/kmail/{ui => configuredialog}/securitypagegeneraltab.ui (100%) rename kdepim/kmail/{ui => configuredialog}/securitypagemdntab.ui (100%) rename kdepim/kmail/{ui => configuredialog}/smimeconfiguration.ui (100%) rename kdepim/kmail/{ui => configuredialog}/warningconfiguration.ui (100%) rename kdepim/kmail/{ui => identity}/identitypage.ui (100%) rename kdepim/kmail/{ui => searchdialog}/searchwindow.ui (100%) rename kdepim/mailcommon/filter/{ui => dialog}/selectthunderbirdfilterfileswidget.ui (100%) rename kdepim/mailcommon/filter/{ui => }/filterconfigwidget.ui (100%) rename kdepim/mailcommon/snippets/{ui => }/snippetdialog.ui (100%) rename kdepim/messagecomposer/imagescaling/{ui => }/imagescalingwidget.ui (100%) rename kdepim/messagecore/attachment/{ui => }/attachmentpropertiesdialog.ui (100%) rename kdepim/messagecore/attachment/{ui => }/attachmentpropertiesdialog_readonly.ui (100%) rename kdepim/messageviewer/adblock/{ui => }/adblockcreatefilterwidget.ui (100%) rename kdepim/messageviewer/adblock/{ui => }/settings_adblock.ui (100%) rename kdepim/messageviewer/{ui => settings}/settings.ui (100%) rename kdepim/messageviewer/{ui => widgets}/invitationsettings.ui (100%) rename kdepim/messageviewer/{ui => widgets}/printingsettings.ui (100%) create mode 120000 kdepim/messageviewer/widgets/settings.ui rename kdepim/pimcommon/widgets/{ui => }/manageaccountwidget.ui (100%) rename kdepim/templateparser/{ui => }/customtemplates_base.ui (100%) rename kdepim/templateparser/{ui => }/templatesconfiguration_base.ui (100%) diff --git a/kdepim/CMakeLists.txt b/kdepim/CMakeLists.txt index bdea212d..9fdadf94 100644 --- a/kdepim/CMakeLists.txt +++ b/kdepim/CMakeLists.txt @@ -117,7 +117,12 @@ configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCu ############### search Boost ############### find_package(Boost 1.34.0) -set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "http://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications") +set_package_properties(Boost PROPERTIES + DESCRIPTION "Boost C++ Libraries" + URL "http://www.boost.org" + TYPE REQUIRED PURPOSE + "Boost is required for building most KDEPIM applications" +) # Kleopatra needs to know if the topological.hpp header exists (part of Boost_graph). find_path(Boost_TOPOLOGICAL_SORT_DIR NAMES boost/graph/topological_sort.hpp PATHS ${Boost_INCLUDE_DIRS}) @@ -146,10 +151,21 @@ endif() # If the KDEPIM_ONLY_KLEO option is true if(KDEPIM_ONLY_KLEO) find_package(QGpgme) - set_package_properties(QGpgme PROPERTIES DESCRIPTION "The QGpgME library" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "QGpgME is required to build Kleopatra.") + set_package_properties(QGpgme PROPERTIES + DESCRIPTION "The QGpgME library" + URL "http://www.kde.org" + TYPE REQUIRED + PURPOSE "QGpgME is required to build Kleopatra." + ) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS}) - include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${QT_QTDBUS_INCLUDE_DIR}) + include_directories ( + ${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${KDE4_INCLUDES} + ${KDEPIMLIBS_INCLUDE_DIRS} + ${QT_QTDBUS_INCLUDE_DIR} + ) include(kleopatra/ConfigureChecks.cmake) add_subdirectory(libkleo) @@ -162,44 +178,76 @@ else() ############### Find the stuff we need ############### # Akonadi find_package(Akonadi 1.12.90 QUIET CONFIG) - set_package_properties(Akonadi PROPERTIES DESCRIPTION "Akonadi server libraries" URL "http://pim.kde.org/akonadi" TYPE REQUIRED PURPOSE "Akonadi is required to build KDEPIM") + set_package_properties(Akonadi PROPERTIES + DESCRIPTION "Akonadi server libraries" + URL "http://pim.kde.org/akonadi" + TYPE REQUIRED + PURPOSE "Akonadi is required to build KDEPIM" + ) find_package(ZLIB) - set_package_properties(ZLIB PROPERTIES DESCRIPTION "The Zlib compression library" URL "http://www.zlib.net" TYPE REQUIRED) + set_package_properties(ZLIB PROPERTIES + DESCRIPTION "The Zlib compression library" + URL "http://www.zlib.net" + TYPE REQUIRED + ) find_package(QGpgme) - 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") + 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)." + 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)." ) + # FIXME: rip it off find_package(Baloo 4.14.0 QUIET CONFIG) set_package_properties(Baloo PROPERTIES DESCRIPTION "The Baloo libraries" URL "http://www.kde.org" - # FIXME: rip it off - # TYPE REQUIRED + TYPE RECOMMENDED PURPOSE "Baloo provides search capabilities in KMail and Akonadi" - ) + ) # Xsltproc find_package(Xsltproc) - set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces.") + set_package_properties(Xsltproc PROPERTIES + DESCRIPTION "XSLT processor from libxslt" + TYPE REQUIRED + PURPOSE "Required to generate D-Bus interfaces." + ) find_package(QJSON) - set_package_properties(QJSON PROPERTIES DESCRIPTION "QJSON" URL "http://qjson.sourceforge.net/" TYPE REQUIRED PURPOSE "Qt library for handling JSON data") + set_package_properties(QJSON PROPERTIES + DESCRIPTION "QJSON" + URL "http://qjson.sourceforge.net/" + TYPE REQUIRED + PURPOSE "Qt library for handling JSON data" + ) find_package(Prison QUIET CONFIG) - set_package_properties(Prison PROPERTIES DESCRIPTION "The Prison library" URL "http://projects.kde.org/prison" TYPE OPTIONAL PURPOSE "Needed to show mobile barcodes of your contacts") + set_package_properties(Prison PROPERTIES + DESCRIPTION "The Prison library" + URL "http://projects.kde.org/prison" + TYPE OPTIONAL + PURPOSE "Needed to show mobile barcodes of your contacts" + ) # Libkgapi2 find_package(LibKGAPI2 2.2.0 QUIET CONFIG) - set_package_properties(LibKGAPI2 PROPERTIES DESCRIPTION "KDE-based library for accessing various Google services" URL "https://projects.kde.org/libkgapi" TYPE OPTIONAL PURPOSE "LibKGAPI is required to build Google Drive Storage Service") + set_package_properties(LibKGAPI2 PROPERTIES + DESCRIPTION "KDE-based library for accessing various Google services" + URL "https://projects.kde.org/libkgapi" + TYPE OPTIONAL + PURPOSE "LibKGAPI is required to build Google Drive Storage Service") if( LibKGAPI2_FOUND ) add_definitions( -DKDEPIM_STORAGESERVICE_GDRIVE ) @@ -208,9 +256,21 @@ else() ############### Needed commands before building anything ############### - add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS} ${AKONADI_DEFINITIONS}) + add_definitions ( + ${QT_DEFINITIONS} + ${KDE4_DEFINITIONS} + ${KDEPIM_DEFINITIONS} + ${AKONADI_DEFINITIONS} + ) - include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDEPIMLIBS_INCLUDE_DIRS} ${KDE4_INCLUDES} ${QT_QTDBUS_INCLUDE_DIR} ${Boost_INCLUDE_DIR}) + include_directories ( + ${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${KDEPIMLIBS_INCLUDE_DIRS} + ${KDE4_INCLUDES} + ${QT_QTDBUS_INCLUDE_DIR} + ${Boost_INCLUDE_DIR} + ) if(NOT KDEPIMLIBS_KRESOURCES_LIBRARY) add_definitions( -DKDEPIM_NO_KRESOURCES ) diff --git a/kdepim/composereditor-ng/CMakeLists.txt b/kdepim/composereditor-ng/CMakeLists.txt index 0e648d6c..212f3245 100644 --- a/kdepim/composereditor-ng/CMakeLists.txt +++ b/kdepim/composereditor-ng/CMakeLists.txt @@ -7,8 +7,6 @@ add_definitions( -DQT_NO_CAST_TO_ASCII ) # Laurent install it if you want to debug it #add_subdirectory(tests) -add_definitions(-DQT_STATICPLUGIN) - set(libcomposereditor_ng_SRCS composereditor.cpp composerview.cpp diff --git a/kdepim/composereditor-ng/spellplugin/kspellplugin.cpp b/kdepim/composereditor-ng/spellplugin/kspellplugin.cpp index ccd56c08..ee227104 100644 --- a/kdepim/composereditor-ng/spellplugin/kspellplugin.cpp +++ b/kdepim/composereditor-ng/spellplugin/kspellplugin.cpp @@ -109,10 +109,8 @@ void KWebSpellChecker::checkSpellingOfString(const QString& word, int* misspelli QString str = finder.string().mid(start, end - start); if (isValidWord(str)) { -#if 1 qDebug() << "Word at " << start << " word = '" << str << "', len = " << str.length(); -#endif if (m_speller->isMisspelled(str)) { *misspellingLocation = start; diff --git a/kdepim/kmail/ui/accountspagereceivingtab.ui b/kdepim/kmail/configuredialog/accountspagereceivingtab.ui similarity index 100% rename from kdepim/kmail/ui/accountspagereceivingtab.ui rename to kdepim/kmail/configuredialog/accountspagereceivingtab.ui diff --git a/kdepim/kmail/ui/composercryptoconfiguration.ui b/kdepim/kmail/configuredialog/composercryptoconfiguration.ui similarity index 100% rename from kdepim/kmail/ui/composercryptoconfiguration.ui rename to kdepim/kmail/configuredialog/composercryptoconfiguration.ui diff --git a/kdepim/kmail/configuredialog/customtemplates_base.ui b/kdepim/kmail/configuredialog/customtemplates_base.ui new file mode 120000 index 00000000..fab7bb37 --- /dev/null +++ b/kdepim/kmail/configuredialog/customtemplates_base.ui @@ -0,0 +1 @@ +../../templateparser/customtemplates_base.ui \ No newline at end of file diff --git a/kdepim/kmail/ui/miscpagemaintab.ui b/kdepim/kmail/configuredialog/miscpagemaintab.ui similarity index 100% rename from kdepim/kmail/ui/miscpagemaintab.ui rename to kdepim/kmail/configuredialog/miscpagemaintab.ui diff --git a/kdepim/kmail/ui/securitypagegeneraltab.ui b/kdepim/kmail/configuredialog/securitypagegeneraltab.ui similarity index 100% rename from kdepim/kmail/ui/securitypagegeneraltab.ui rename to kdepim/kmail/configuredialog/securitypagegeneraltab.ui diff --git a/kdepim/kmail/ui/securitypagemdntab.ui b/kdepim/kmail/configuredialog/securitypagemdntab.ui similarity index 100% rename from kdepim/kmail/ui/securitypagemdntab.ui rename to kdepim/kmail/configuredialog/securitypagemdntab.ui diff --git a/kdepim/kmail/ui/smimeconfiguration.ui b/kdepim/kmail/configuredialog/smimeconfiguration.ui similarity index 100% rename from kdepim/kmail/ui/smimeconfiguration.ui rename to kdepim/kmail/configuredialog/smimeconfiguration.ui diff --git a/kdepim/kmail/ui/warningconfiguration.ui b/kdepim/kmail/configuredialog/warningconfiguration.ui similarity index 100% rename from kdepim/kmail/ui/warningconfiguration.ui rename to kdepim/kmail/configuredialog/warningconfiguration.ui diff --git a/kdepim/kmail/ui/identitypage.ui b/kdepim/kmail/identity/identitypage.ui similarity index 100% rename from kdepim/kmail/ui/identitypage.ui rename to kdepim/kmail/identity/identitypage.ui diff --git a/kdepim/kmail/ui/searchwindow.ui b/kdepim/kmail/searchdialog/searchwindow.ui similarity index 100% rename from kdepim/kmail/ui/searchwindow.ui rename to kdepim/kmail/searchdialog/searchwindow.ui diff --git a/kdepim/libkdepim/CMakeLists.txt b/kdepim/libkdepim/CMakeLists.txt index a39452b4..57c8f38d 100644 --- a/kdepim/libkdepim/CMakeLists.txt +++ b/kdepim/libkdepim/CMakeLists.txt @@ -4,8 +4,9 @@ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5300) add_definitions( -DQT_NO_CAST_FROM_ASCII ) add_definitions( -DQT_NO_CAST_TO_ASCII ) - - +if(BALOO_FOUND) + add_definitions(-DHAVE_BALOO) +endif() if(ENABLE_TESTING) add_subdirectory(tests) diff --git a/kdepim/libkdepim/addressline/addresseelineedit.cpp b/kdepim/libkdepim/addressline/addresseelineedit.cpp index 2fa47a0c..928ece70 100644 --- a/kdepim/libkdepim/addressline/addresseelineedit.cpp +++ b/kdepim/libkdepim/addressline/addresseelineedit.cpp @@ -39,7 +39,9 @@ #include #include +#ifdef HAVE_BALOO #include +#endif #include #include @@ -381,6 +383,7 @@ QStringList AddresseeLineEdit::Private::cleanupBalooContact(const QStringList &l void AddresseeLineEdit::Private::searchInBaloo() { +#ifdef HAVE_BALOO const QString trimmedString = m_searchString.trimmed(); Baloo::PIM::ContactCompleter com(trimmedString, 20); const QStringList listEmail = cleanupBalooContact(com.complete()); @@ -390,6 +393,7 @@ void AddresseeLineEdit::Private::searchInBaloo() doCompletion( m_lastSearchMode ); // if ( q->hasFocus() || q->completionBox()->hasFocus() ) { //} +#endif } void AddresseeLineEdit::Private::alternateColor() diff --git a/kdepim/mailcommon/filter/ui/selectthunderbirdfilterfileswidget.ui b/kdepim/mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.ui similarity index 100% rename from kdepim/mailcommon/filter/ui/selectthunderbirdfilterfileswidget.ui rename to kdepim/mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.ui diff --git a/kdepim/mailcommon/filter/ui/filterconfigwidget.ui b/kdepim/mailcommon/filter/filterconfigwidget.ui similarity index 100% rename from kdepim/mailcommon/filter/ui/filterconfigwidget.ui rename to kdepim/mailcommon/filter/filterconfigwidget.ui diff --git a/kdepim/mailcommon/snippets/ui/snippetdialog.ui b/kdepim/mailcommon/snippets/snippetdialog.ui similarity index 100% rename from kdepim/mailcommon/snippets/ui/snippetdialog.ui rename to kdepim/mailcommon/snippets/snippetdialog.ui diff --git a/kdepim/messagecomposer/imagescaling/ui/imagescalingwidget.ui b/kdepim/messagecomposer/imagescaling/imagescalingwidget.ui similarity index 100% rename from kdepim/messagecomposer/imagescaling/ui/imagescalingwidget.ui rename to kdepim/messagecomposer/imagescaling/imagescalingwidget.ui diff --git a/kdepim/messagecore/attachment/ui/attachmentpropertiesdialog.ui b/kdepim/messagecore/attachment/attachmentpropertiesdialog.ui similarity index 100% rename from kdepim/messagecore/attachment/ui/attachmentpropertiesdialog.ui rename to kdepim/messagecore/attachment/attachmentpropertiesdialog.ui diff --git a/kdepim/messagecore/attachment/ui/attachmentpropertiesdialog_readonly.ui b/kdepim/messagecore/attachment/attachmentpropertiesdialog_readonly.ui similarity index 100% rename from kdepim/messagecore/attachment/ui/attachmentpropertiesdialog_readonly.ui rename to kdepim/messagecore/attachment/attachmentpropertiesdialog_readonly.ui diff --git a/kdepim/messageviewer/adblock/ui/adblockcreatefilterwidget.ui b/kdepim/messageviewer/adblock/adblockcreatefilterwidget.ui similarity index 100% rename from kdepim/messageviewer/adblock/ui/adblockcreatefilterwidget.ui rename to kdepim/messageviewer/adblock/adblockcreatefilterwidget.ui diff --git a/kdepim/messageviewer/adblock/ui/settings_adblock.ui b/kdepim/messageviewer/adblock/settings_adblock.ui similarity index 100% rename from kdepim/messageviewer/adblock/ui/settings_adblock.ui rename to kdepim/messageviewer/adblock/settings_adblock.ui diff --git a/kdepim/messageviewer/ui/settings.ui b/kdepim/messageviewer/settings/settings.ui similarity index 100% rename from kdepim/messageviewer/ui/settings.ui rename to kdepim/messageviewer/settings/settings.ui diff --git a/kdepim/messageviewer/ui/invitationsettings.ui b/kdepim/messageviewer/widgets/invitationsettings.ui similarity index 100% rename from kdepim/messageviewer/ui/invitationsettings.ui rename to kdepim/messageviewer/widgets/invitationsettings.ui diff --git a/kdepim/messageviewer/ui/printingsettings.ui b/kdepim/messageviewer/widgets/printingsettings.ui similarity index 100% rename from kdepim/messageviewer/ui/printingsettings.ui rename to kdepim/messageviewer/widgets/printingsettings.ui diff --git a/kdepim/messageviewer/widgets/settings.ui b/kdepim/messageviewer/widgets/settings.ui new file mode 120000 index 00000000..75d3fb2d --- /dev/null +++ b/kdepim/messageviewer/widgets/settings.ui @@ -0,0 +1 @@ +../settings/settings.ui \ No newline at end of file diff --git a/kdepim/pimcommon/autocorrection/autocorrectionwidget.cpp b/kdepim/pimcommon/autocorrection/autocorrectionwidget.cpp index 25f9eb09..2c5a8362 100644 --- a/kdepim/pimcommon/autocorrection/autocorrectionwidget.cpp +++ b/kdepim/pimcommon/autocorrection/autocorrectionwidget.cpp @@ -29,6 +29,7 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils; #include #include +#include #include #include diff --git a/kdepim/pimcommon/widgets/ui/manageaccountwidget.ui b/kdepim/pimcommon/widgets/manageaccountwidget.ui similarity index 100% rename from kdepim/pimcommon/widgets/ui/manageaccountwidget.ui rename to kdepim/pimcommon/widgets/manageaccountwidget.ui diff --git a/kdepim/templateparser/ui/customtemplates_base.ui b/kdepim/templateparser/customtemplates_base.ui similarity index 100% rename from kdepim/templateparser/ui/customtemplates_base.ui rename to kdepim/templateparser/customtemplates_base.ui diff --git a/kdepim/templateparser/ui/templatesconfiguration_base.ui b/kdepim/templateparser/templatesconfiguration_base.ui similarity index 100% rename from kdepim/templateparser/ui/templatesconfiguration_base.ui rename to kdepim/templateparser/templatesconfiguration_base.ui