Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2018-04-27 16:01:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Fri Apr 27 16:01:25 2018 rev:18 rq:598960 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2018-03-22 11:59:03.706701185 +0100 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new/akonadiconsole.changes 2018-04-27 16:01:26.399641695 +0200 @@ -1,0 +2,26 @@ +Wed Apr 18 07:48:27 CEST 2018 - [email protected] + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * None + +------------------------------------------------------------------- +Fri Apr 06 07:08:35 CEST 2018 - [email protected] + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.12.3: + * No need to set AKONADI_MIMELIB_VERSION anymore + * Use qputenv() instead of setenv() + * Make AkonadiConsole buildable on Windows + * Use QPlainTextEdit instead KPimTextEdit + * Remove unused dependencies + * Remove reference to xdgbasedirs + * Use QLAtin1Char + +------------------------------------------------------------------- Old: ---- akonadiconsole-17.12.3.tar.xz New: ---- akonadiconsole-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.6bGGzt/_old 2018-04-27 16:01:27.171613364 +0200 +++ /var/tmp/diff_new_pack.6bGGzt/_new 2018-04-27 16:01:27.175613218 +0200 @@ -17,7 +17,7 @@ Name: akonadiconsole -Version: 17.12.3 +Version: 18.04.0 Release: 0 %define kf5_version 5.28.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ akonadiconsole-17.12.3.tar.xz -> akonadiconsole-18.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/CMakeLists.txt new/akonadiconsole-18.04.0/CMakeLists.txt --- old/akonadiconsole-17.12.3/CMakeLists.txt 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/CMakeLists.txt 2018-04-10 13:50:39.000000000 +0200 @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.1) -set(KDEPIM_VERSION_NUMBER "5.7.3") +set(KDEPIM_VERSION_NUMBER "5.8.0") project(akonadiconsole VERSION ${KDEPIM_VERSION_NUMBER}) -set(KF5_VERSION "5.39.0") +set(KF5_VERSION "5.44.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -27,7 +27,7 @@ include(ECMCoverageOption) # Do NOT add quote -set(KDEPIM_DEV_VERSION ) +set(KDEPIM_DEV_VERSION) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) @@ -40,14 +40,10 @@ set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") - - -set(AKONADI_MIMELIB_VERSION "5.7.3") -set(AKONADI_CONTACT_VERSION "5.7.3") -set(CALENDARSUPPORT_LIB_VERSION_LIB "5.7.3") -set(KPIMTEXTEDIT_LIB_VERSION "5.7.3") -set(AKONADI_VERSION "5.7.3") -set(AKONADI_SEARCH_VERSION "5.7.3") +set(AKONADI_CONTACT_VERSION "5.8.0") +set(CALENDARSUPPORT_LIB_VERSION_LIB "5.8.0") +set(AKONADI_VERSION "5.8.0") +set(AKONADI_SEARCH_VERSION "5.8.0") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") @@ -55,13 +51,11 @@ set(QT_REQUIRED_VERSION "5.8.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION_LIB "5.7.3") -set(LIBKLEO_LIB_VERSION_LIB "5.7.3") -set(LIBKDEPIM_LIB_VERSION_LIB "5.7.3") -set(KCALENDARCORE_LIB_VERSION "5.7.3") -set(KCONTACTS_LIB_VERSION "5.7.3") -set(KMIME_LIB_VERSION "5.7.3") -set(KIMAP_LIB_VERSION "5.7.3") +set(MESSAGELIB_LIB_VERSION_LIB "5.8.0") +set(LIBKDEPIM_LIB_VERSION_LIB "5.8.0") +set(KCALENDARCORE_LIB_VERSION "5.8.0") +set(KCONTACTS_LIB_VERSION "5.8.0") +set(KMIME_LIB_VERSION "5.8.0") # Find KF5 package find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED) @@ -80,31 +74,34 @@ find_package(KF5KIO ${KF5_VERSION} REQUIRED) # Find KdepimLibs Package -find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED) find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED) -find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED) -find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED) -find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED) - -find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED) -find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) -find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED) - -find_package(Xapian CONFIG) -set_package_properties(Xapian PROPERTIES - DESCRIPTION "The Xapian search engine library" - URL "http://xapian.org"; - TYPE REQUIRED -) +if (NOT WIN32) + find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED) + find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION_LIB} CONFIG REQUIRED) + find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) + find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED) + find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED) + + find_package(Xapian CONFIG) + set_package_properties(Xapian PROPERTIES + DESCRIPTION "The Xapian search engine library" + URL "http://xapian.org"; + TYPE REQUIRED + ) + + set(ENABLE_LIBKDEPIM TRUE) + set(ENABLE_SEARCH TRUE) + set(ENABLE_CONTENTVIEWS TRUE) +endif() include_directories(${akonadiconsole_SOURCE_DIR} ${akonadiconsole_BINARY_DIR} ${XAPIAN_INCLUDE_DIR}) +configure_file(config-akonadiconsole.h.cmake ${CMAKE_BINARY_DIR}/config-akonadiconsole.h) + add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_USE_QSTRINGBUILDER) add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackermodeltest.cpp new/akonadiconsole-18.04.0/autotests/jobtrackermodeltest.cpp --- old/akonadiconsole-17.12.3/autotests/jobtrackermodeltest.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackermodeltest.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <[email protected]> + Copyright (C) 2017-2018 Montel Laurent <[email protected]> Copyright (c) 2017 David Faure <[email protected]> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackermodeltest.h new/akonadiconsole-18.04.0/autotests/jobtrackermodeltest.h --- old/akonadiconsole-17.12.3/autotests/jobtrackermodeltest.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackermodeltest.h 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <[email protected]> + Copyright (C) 2017-2018 Montel Laurent <[email protected]> Copyright (c) 2017 David Faure <[email protected]> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackersearchwidgettest.cpp new/akonadiconsole-18.04.0/autotests/jobtrackersearchwidgettest.cpp --- old/akonadiconsole-17.12.3/autotests/jobtrackersearchwidgettest.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackersearchwidgettest.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <[email protected]> + Copyright (C) 2017-2018 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackersearchwidgettest.h new/akonadiconsole-18.04.0/autotests/jobtrackersearchwidgettest.h --- old/akonadiconsole-17.12.3/autotests/jobtrackersearchwidgettest.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackersearchwidgettest.h 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <[email protected]> + Copyright (C) 2017-2018 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackertest.cpp new/akonadiconsole-18.04.0/autotests/jobtrackertest.cpp --- old/akonadiconsole-17.12.3/autotests/jobtrackertest.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackertest.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <[email protected]> + Copyright (C) 2017-2018 Montel Laurent <[email protected]> Copyright (c) 2017 David Faure <[email protected]> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/autotests/jobtrackertest.h new/akonadiconsole-18.04.0/autotests/jobtrackertest.h --- old/akonadiconsole-17.12.3/autotests/jobtrackertest.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/autotests/jobtrackertest.h 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <[email protected]> + Copyright (C) 2017-2018 Montel Laurent <[email protected]> Copyright (c) 2017 David Faure <[email protected]> This program is free software; you can redistribute it and/or modify it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/config-akonadiconsole.h.cmake new/akonadiconsole-18.04.0/config-akonadiconsole.h.cmake --- old/akonadiconsole-17.12.3/config-akonadiconsole.h.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/akonadiconsole-18.04.0/config-akonadiconsole.h.cmake 2018-04-10 13:50:39.000000000 +0200 @@ -0,0 +1,3 @@ +#cmakedefine ENABLE_LIBKDEPIM 1 +#cmakedefine ENABLE_SEARCH 1 +#cmakedefine ENABLE_CONTENTVIEWS 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/CMakeLists.txt new/akonadiconsole-18.04.0/src/CMakeLists.txt --- old/akonadiconsole-17.12.3/src/CMakeLists.txt 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/CMakeLists.txt 2018-04-10 13:50:39.000000000 +0200 @@ -36,11 +36,17 @@ monitorsmodel.cpp notificationmodel.cpp notificationmonitor.cpp - searchwidget.cpp querydebugger.cpp tagpropertiesdialog.cpp ${libakonadiconsole_tracker_SRCS} +) + +if (ENABLE_SEARCH) + set(libakonadiconsole_SRCS + ${libakonadiconsole_SRCS} + searchwidget.cpp ) +endif() qt5_generate_dbus_interface(jobtracker.h org.freedesktop.Akonadi.JobTracker.xml) qt5_add_dbus_adaptor(libakonadiconsole_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Akonadi.JobTracker.xml jobtracker.h JobTracker) @@ -89,25 +95,39 @@ target_link_libraries(libakonadiconsole KF5::AkonadiCore KF5::AkonadiPrivate - KF5::AkonadiContact KF5::AkonadiWidgets KF5::AkonadiXml - KF5::AkonadiSearchCore - KF5::AkonadiSearchXapian - KF5::CalendarSupport + KF5::Mime + KF5::Contacts KF5::CalendarCore - KF5::Libkdepim - KF5::MessageViewer - KF5::DBusAddons - KF5::PimTextEdit Qt5::Sql - KF5::Crash KF5::Completion KF5::ItemViews KF5::TextWidgets KF5::XmlGui ) +if (ENABLE_SEARCH) + target_link_libraries(libakonadiconsole + KF5::AkonadiSearchCore + KF5::AkonadiSearchXapian + ) +endif() + +if (ENABLE_CONTENTVIEWS) + target_link_libraries(libakonadiconsole + KF5::AkonadiContact + KF5::CalendarSupport + KF5::MessageViewer + ) +endif() + +if (ENABLE_LIBKDEPIM) + target_link_libraries(libakonadiconsole + KF5::Libkdepim + ) +endif() + set_target_properties(libakonadiconsole PROPERTIES OUTPUT_NAME akonadiconsole VERSION ${KDEPIM_LIB_VERSION} @@ -128,25 +148,10 @@ target_link_libraries(akonadiconsole libakonadiconsole - KF5::AkonadiCore - KF5::AkonadiPrivate - KF5::AkonadiContact - KF5::AkonadiXml - KF5::AkonadiSearchCore - KF5::AkonadiSearchXapian - KF5::CalendarSupport - KF5::CalendarCore - KF5::Libkdepim - KF5::MessageViewer KF5::DBusAddons - KF5::PimTextEdit - Qt5::Sql + KF5::CoreAddons KF5::Crash - KF5::Completion - KF5::ItemViews - KF5::TextWidgets - KF5::XmlGui - ) +) install(TARGETS akonadiconsole ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(PROGRAMS org.kde.akonadiconsole.desktop DESTINATION ${KDE_INSTALL_APPDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/agentwidget.cpp new/akonadiconsole-18.04.0/src/agentwidget.cpp --- old/akonadiconsole-17.12.3/src/agentwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/agentwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -23,7 +23,6 @@ #include "agentconfigdialog.h" #include "akonadiconsole_debug.h" -#include "kpimtextedit/plaintexteditorwidget.h" #include <AkonadiWidgets/agenttypedialog.h> #include <AkonadiWidgets/agentinstancewidget.h> #include <AkonadiCore/agentmanager.h> @@ -47,6 +46,7 @@ #include <KGuiItem> #include <QDialogButtonBox> #include <QVBoxLayout> +#include <QPlainTextEdit> class TextDialog : public QDialog { @@ -55,7 +55,7 @@ : QDialog(parent) { QVBoxLayout *mainLayout = new QVBoxLayout(this); - mText = new KPIMTextEdit::PlainTextEditorWidget(this); + mText = new QPlainTextEdit(this); mText->setReadOnly(true); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok, this); @@ -76,7 +76,7 @@ } private: - KPIMTextEdit::PlainTextEditorWidget *mText = nullptr; + QPlainTextEdit *mText = nullptr; }; using namespace Akonadi; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/browserwidget.cpp new/akonadiconsole-18.04.0/src/browserwidget.cpp --- old/akonadiconsole-17.12.3/src/browserwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/browserwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -25,6 +25,7 @@ #include "dbaccess.h" #include "akonadibrowsermodel.h" #include "tagpropertiesdialog.h" +#include "config-akonadiconsole.h" #include <AkonadiCore/attributefactory.h> #include <AkonadiCore/changerecorder.h> @@ -76,6 +77,13 @@ #include <QFileDialog> #include <QSqlError> +#ifdef ENABLE_CONTENTVIEWS +#include <CalendarSupport/IncidenceViewer> +#include <messageviewer/viewer.h> +#include <Akonadi/Contact/ContactViewer> +#include <Akonadi/Contact/ContactGroupViewer> +#endif + using namespace Akonadi; AKONADI_COLLECTION_PROPERTIES_PAGE_FACTORY(CollectionAttributePageFactory, CollectionAttributePage) @@ -209,6 +217,28 @@ connect(contentUi.saveButton, &QPushButton::clicked, this, &BrowserWidget::save); splitter3->addWidget(contentViewParent); +#ifdef ENABLE_CONTENTVIEWS + auto w = new QWidget; + w->setLayout(new QVBoxLayout); + w->layout()->addWidget(mContactView = new Akonadi::ContactViewer); + contentUi.stack->addWidget(w); + + w = new QWidget; + w->setLayout(new QVBoxLayout); + w->layout()->addWidget(mContactGroupView = new Akonadi::ContactGroupViewer); + contentUi.stack->addWidget(w); + + w = new QWidget; + w->setLayout(new QVBoxLayout); + w->layout()->addWidget(mIncidenceView = new CalendarSupport::IncidenceViewer); + contentUi.stack->addWidget(w); + + w = new QWidget; + w->setLayout(new QVBoxLayout); + w->layout()->addWidget(mMailView = new MessageViewer::Viewer(this)); + contentUi.stack->addWidget(w); +#endif + connect(contentUi.attrAddButton, &QPushButton::clicked, this, &BrowserWidget::addAttribute); connect(contentUi.attrDeleteButton, &QPushButton::clicked, this, &BrowserWidget::delAttribute); connect(contentUi.flags, &KEditListWidget::changed, this, &BrowserWidget::contentViewChanged); @@ -295,20 +325,23 @@ void BrowserWidget::setItem(const Akonadi::Item &item) { mCurrentItem = item; +#ifdef ENABLE_CONTENTVIEWS if (item.hasPayload<KContacts::Addressee>()) { - contentUi.contactView->setItem(item); - contentUi.stack->setCurrentWidget(contentUi.contactViewPage); + mContactView->setItem(item); + contentUi.stack->setCurrentWidget(mContactView->parentWidget()); } else if (item.hasPayload<KContacts::ContactGroup>()) { - contentUi.contactGroupView->setItem(item); - contentUi.stack->setCurrentWidget(contentUi.contactGroupViewPage); + mContactGroupView->setItem(item); + contentUi.stack->setCurrentWidget(mContactGroupView->parentWidget()); } else if (item.hasPayload<KCalCore::Incidence::Ptr>()) { - contentUi.incidenceView->setItem(item); - contentUi.stack->setCurrentWidget(contentUi.incidenceViewPage); + mIncidenceView->setItem(item); + contentUi.stack->setCurrentWidget(mIncidenceView->parentWidget()); } else if (item.mimeType() == QLatin1String("message/rfc822") || item.mimeType() == QLatin1String("message/news")) { - contentUi.mailView->setMessageItem(item, MimeTreeParser::Force); - contentUi.stack->setCurrentWidget(contentUi.mailViewPage); - } else if (item.hasPayload<QPixmap>()) { + mMailView->setMessageItem(item, MimeTreeParser::Force); + contentUi.stack->setCurrentWidget(mMailView->parentWidget()); + } else +#endif + if (item.hasPayload<QPixmap>()) { contentUi.imageView->setPixmap(item.payload<QPixmap>()); contentUi.stack->setCurrentWidget(contentUi.imageViewPage); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/browserwidget.h new/akonadiconsole-18.04.0/src/browserwidget.h --- old/akonadiconsole-17.12.3/src/browserwidget.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/browserwidget.h 2018-04-10 13:50:39.000000000 +0200 @@ -49,6 +49,16 @@ class Monitor; class TagModel; class StatisticsProxyModel; +class ContactViewer; +class ContactGroupViewer; +} + +namespace CalendarSupport { +class IncidenceViewer; +} + +namespace MessageViewer { +class Viewer; } class BrowserWidget: public QWidget @@ -103,6 +113,11 @@ KToggleAction *mCacheOnlyAction = nullptr; QTreeView *mTagView = nullptr; Akonadi::TagModel *mTagModel = nullptr; + + Akonadi::ContactViewer *mContactView = nullptr; + Akonadi::ContactGroupViewer *mContactGroupView = nullptr; + CalendarSupport::IncidenceViewer *mIncidenceView = nullptr; + MessageViewer::Viewer *mMailView = nullptr; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/browserwidget_contentview.ui new/akonadiconsole-18.04.0/src/browserwidget_contentview.ui --- old/akonadiconsole-17.12.3/src/browserwidget_contentview.ui 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/browserwidget_contentview.ui 2018-04-10 13:50:39.000000000 +0200 @@ -94,58 +94,6 @@ </item> </layout> </widget> - <widget class="QWidget" name="contactViewPage"> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <item> - <widget class="Akonadi::ContactViewer" name="contactView" native="true"/> - </item> - </layout> - </widget> - <widget class="QWidget" name="contactGroupViewPage"> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <item> - <widget class="Akonadi::ContactGroupViewer" name="contactGroupView" native="true"/> - </item> - </layout> - </widget> - <widget class="QWidget" name="incidenceViewPage"> - <layout class="QVBoxLayout"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <widget class="CalendarSupport::IncidenceViewer" name="incidenceView" native="true"/> - </item> - </layout> - </widget> - <widget class="QWidget" name="mailViewPage"> - <layout class="QGridLayout" name="gridLayout1"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item row="0" column="0"> - <widget class="MessageViewer::Viewer" name="mailView"/> - </item> - </layout> - </widget> </widget> </item> </layout> @@ -431,28 +379,6 @@ <header>keditlistwidget.h</header> <container>1</container> </customwidget> - <customwidget> - <class>CalendarSupport::IncidenceViewer</class> - <extends>QWidget</extends> - <header location="global">CalendarSupport/IncidenceViewer</header> - </customwidget> - <customwidget> - <class>MessageViewer::Viewer</class> - <extends>QTextBrowser</extends> - <header location="global">messageviewer/viewer.h</header> - </customwidget> - <customwidget> - <class>Akonadi::ContactViewer</class> - <extends>QWidget</extends> - <header location="global">Akonadi/Contact/ContactViewer</header> - <container>1</container> - </customwidget> - <customwidget> - <class>Akonadi::ContactGroupViewer</class> - <extends>QWidget</extends> - <header location="global">Akonadi/Contact/ContactGroupViewer</header> - <container>1</container> - </customwidget> </customwidgets> <resources/> <connections/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/dbconsoletab.ui new/akonadiconsole-18.04.0/src/dbconsoletab.ui --- old/akonadiconsole-17.12.3/src/dbconsoletab.ui 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/dbconsoletab.ui 2018-04-10 13:50:39.000000000 +0200 @@ -73,7 +73,7 @@ <widget class="QWidget" name="layoutWidget"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="KPIMTextEdit::PlainTextEditorWidget" name="queryEdit"/> + <widget class="QPlainTextEdit" name="queryEdit"/> </item> <item> <widget class="QPushButton" name="execButton"> @@ -94,13 +94,6 @@ </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>KPIMTextEdit::PlainTextEditorWidget</class> - <extends>QWidget</extends> - <header>kpimtextedit/plaintexteditorwidget.h</header> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/debugwidget.cpp new/akonadiconsole-18.04.0/src/debugwidget.cpp --- old/akonadiconsole-17.12.3/src/debugwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/debugwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -45,7 +45,7 @@ QString service = QStringLiteral("org.freedesktop.Akonadi"); if (Akonadi::ServerManager::hasInstanceIdentifier()) { - service += QLatin1String(".") + Akonadi::ServerManager::instanceIdentifier(); + service += QLatin1Char('.') + Akonadi::ServerManager::instanceIdentifier(); } mDebugInterface = new DebugInterface(service, QStringLiteral("/debug"), QDBusConnection::sessionBus(), this); QCheckBox *cb = new QCheckBox(QStringLiteral("Enable debugger"), this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/instanceselector.cpp new/akonadiconsole-18.04.0/src/instanceselector.cpp --- old/akonadiconsole-17.12.3/src/instanceselector.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/instanceselector.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -26,7 +26,6 @@ #include <QIcon> #include <akonadi/private/instance_p.h> #include <akonadi/private/dbus_p.h> -#include <akonadi/private/xdgbasedirs_p.h> #include <QApplication> #include <QDBusConnection> @@ -96,15 +95,6 @@ } QDialog::accept(); - if (!m_instance.isEmpty()) { - QDBusInterface serverIface(QStringLiteral("org.freedesktop.Akonadi.%1").arg(m_instance), - QStringLiteral("/Server"), - QStringLiteral("org.freedesktop.Akonadi.Server"), - QDBusConnection::sessionBus()); - const QDBusReply<QString> serverPath = serverIface.call(QStringLiteral("serverPath")); - Akonadi::XdgBaseDirs::overrideConfigPath(serverPath); - } - qputenv("AKONADI_INSTANCE", m_instance.toUtf8()); Akonadi::Instance::setIdentifier(m_instance); MainWindow *mWindow = new MainWindow; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/jobtrackerfilterproxymodel.cpp new/akonadiconsole-18.04.0/src/jobtrackerfilterproxymodel.cpp --- old/akonadiconsole-17.12.3/src/jobtrackerfilterproxymodel.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/jobtrackerfilterproxymodel.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <[email protected]> + Copyright (C) 2017-2018 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/jobtrackerfilterproxymodel.h new/akonadiconsole-18.04.0/src/jobtrackerfilterproxymodel.h --- old/akonadiconsole-17.12.3/src/jobtrackerfilterproxymodel.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/jobtrackerfilterproxymodel.h 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <[email protected]> + Copyright (C) 2017-2018 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/jobtrackersearchwidget.cpp new/akonadiconsole-18.04.0/src/jobtrackersearchwidget.cpp --- old/akonadiconsole-17.12.3/src/jobtrackersearchwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/jobtrackersearchwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <[email protected]> + Copyright (C) 2017-2018 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/jobtrackersearchwidget.h new/akonadiconsole-18.04.0/src/jobtrackersearchwidget.h --- old/akonadiconsole-17.12.3/src/jobtrackersearchwidget.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/jobtrackersearchwidget.h 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (c) 2017 Montel Laurent <[email protected]> + Copyright (C) 2017-2018 Montel Laurent <[email protected]> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/main.cpp new/akonadiconsole-18.04.0/src/main.cpp --- old/akonadiconsole-17.12.3/src/main.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/main.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -32,8 +32,6 @@ #include <QCommandLineOption> #include <QDBusMetaType> -#include <stdlib.h> - int main(int argc, char **argv) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); @@ -49,7 +47,7 @@ QStringLiteral("0.99"), QStringLiteral("The Management and Debugging Console for Akonadi"), KAboutLicense::GPL, - QStringLiteral("(c) 2006-2016 the Akonadi developer"), QString(), + QStringLiteral("(c) 2006-2018 the Akonadi developer"), QString(), QStringLiteral("https://community.kde.org/KDE_PIM/akonadi";)); QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("akonadi"))); aboutData.addAuthor(QStringLiteral("Tobias König"), QStringLiteral("Author"), QStringLiteral("[email protected]")); @@ -73,8 +71,8 @@ if (parser.isSet(QStringLiteral("remote"))) { const QString akonadiAddr = QStringLiteral("tcp:host=%1,port=31415").arg(parser.value(QStringLiteral("remote"))); const QString dbusAddr = QStringLiteral("tcp:host=%1,port=31416").arg(parser.value(QStringLiteral("remote"))); - setenv("AKONADI_SERVER_ADDRESS", akonadiAddr.toLatin1(), 1); - setenv("DBUS_SESSION_BUS_ADDRESS", dbusAddr.toLatin1(), 1); + qputenv("AKONADI_SERVER_ADDRESS", akonadiAddr.toLatin1()); + qputenv("DBUS_SESSION_BUS_ADDRESS", dbusAddr.toLatin1()); } InstanceSelector instanceSelector(parser.isSet(QStringLiteral("remote")) ? parser.value(QStringLiteral("remote")) : QString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/mainwidget.cpp new/akonadiconsole-18.04.0/src/mainwidget.cpp --- old/akonadiconsole-17.12.3/src/mainwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/mainwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -21,11 +21,14 @@ #include "mainwidget.h" +#include "config-akonadiconsole.h" #include "agentwidget.h" #include "dbbrowser.h" #include "dbconsole.h" #include "debugwidget.h" +#ifdef ENABLE_SEARCH #include "searchwidget.h" +#endif #include "jobtrackerwidget.h" #include "notificationmonitor.h" #include "monitorswidget.h" @@ -63,7 +66,9 @@ tabWidget->addTab(new JobTrackerWidget("jobtracker", tabWidget, QStringLiteral("Enable job tracker")), QStringLiteral("Job Tracker")); tabWidget->addTab(new JobTrackerWidget("resourcesJobtracker", tabWidget, QStringLiteral("Enable tracking of Resource Schedulers")), QStringLiteral("Resources Schedulers")); tabWidget->addTab(new NotificationMonitor(tabWidget), QStringLiteral("Notification Monitor")); +#ifdef ENABLE_SEARCH tabWidget->addTab(new SearchWidget(tabWidget), QStringLiteral("Item Search")); +#endif tabWidget->addTab(new MonitorsWidget(tabWidget), QStringLiteral("Monitors")); auto action = parent->actionCollection()->addAction(QStringLiteral("akonadiconsole_akonadi2xml")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/mainwindow.cpp new/akonadiconsole-18.04.0/src/mainwindow.cpp --- old/akonadiconsole-17.12.3/src/mainwindow.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/mainwindow.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -20,8 +20,11 @@ */ #include "mainwindow.h" +#include "config-akonadiconsole.h" +#ifdef ENABLE_LIBKDEPIM #include <Libkdepim/UiStateSaver> +#endif #include <KActionCollection> #include <KConfigGroup> @@ -39,9 +42,9 @@ KStandardAction::quit(qApp, &QApplication::quit, actionCollection()); setupGUI(Keys /*| ToolBar | StatusBar*/ | Save | Create, QStringLiteral("akonadiconsoleui.rc")); - +#ifdef ENABLE_LIBKDEPIM KPIM::UiStateSaver::restoreState(this, KConfigGroup(KSharedConfig::openConfig(), "UiState")); - +#endif KMessageBox::information(this, QStringLiteral("<p>Akonadi Console is purely a development tool. " "It allows you to view and change internal data structures of Akonadi. " "You should only change data in here if you know what you are doing, otherwise " @@ -57,8 +60,10 @@ void MainWindow::closeEvent(QCloseEvent *event) { +#ifdef ENABLE_LIBKDEPIM KConfigGroup config(KSharedConfig::openConfig(), "UiState"); KPIM::UiStateSaver::saveState(this, config); KSharedConfig::openConfig()->sync(); +#endif KXmlGuiWindow::closeEvent(event); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/org.kde.akonadiconsole.desktop new/akonadiconsole-18.04.0/src/org.kde.akonadiconsole.desktop --- old/akonadiconsole-17.12.3/src/org.kde.akonadiconsole.desktop 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/org.kde.akonadiconsole.desktop 2018-04-10 13:50:39.000000000 +0200 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Akonadi Console +Name[ar]=معراض أكونادي Name[ast]=Consola d'Akonadi Name[ca]=Consola de l'Akonadi Name[ca@valencia]=Consola de l'Akonadi @@ -33,6 +34,7 @@ Icon=akonadiconsole Type=Application Comment=Akonadi Management and Debugging Console +Comment[ar]=معراض لإدارة وتنقيح «أكونادي» Comment[ca]=Consola de gestió i depuració per a l'Akonadi Comment[ca@valencia]=Consola de gestió i depuració per a l'Akonadi Comment[cs]=Správa Akonadi a ladicí konzole diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/querydebugger.cpp new/akonadiconsole-18.04.0/src/querydebugger.cpp --- old/akonadiconsole-17.12.3/src/querydebugger.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/querydebugger.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -718,7 +718,7 @@ QString service = QStringLiteral("org.freedesktop.Akonadi"); if (Akonadi::ServerManager::hasInstanceIdentifier()) { - service += QLatin1String(".") + Akonadi::ServerManager::instanceIdentifier(); + service += QLatin1Char('.') + Akonadi::ServerManager::instanceIdentifier(); } mDebugger = new org::freedesktop::Akonadi::StorageDebugger(service, QStringLiteral("/storageDebug"), QDBusConnection::sessionBus(), this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/searchwidget.cpp new/akonadiconsole-18.04.0/src/searchwidget.cpp --- old/akonadiconsole-17.12.3/src/searchwidget.cpp 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/searchwidget.cpp 2018-04-10 13:50:39.000000000 +0200 @@ -29,7 +29,6 @@ #include <AkonadiCore/itemfetchscope.h> #include <AkonadiCore/itemsearchjob.h> #include <AkonadiCore/SearchQuery> -#include <kpimtextedit/plaintexteditorwidget.h> #include <AkonadiSearch/Core/searchstore.h> @@ -38,6 +37,7 @@ #include <KComboBox> #include <KMessageBox> #include <QTextBrowser> +#include <QPlainTextEdit> #include <KSharedConfig> #include <KConfigGroup> @@ -72,7 +72,7 @@ auto w = new QWidget; QVBoxLayout *vbox = new QVBoxLayout(w); vbox->addWidget(new QLabel(QStringLiteral("Search query:"))); - mQueryWidget = new KPIMTextEdit::PlainTextEditorWidget; + mQueryWidget = new QPlainTextEdit; vbox->addWidget(mQueryWidget); mVSplitter->addWidget(w); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-17.12.3/src/searchwidget.h new/akonadiconsole-18.04.0/src/searchwidget.h --- old/akonadiconsole-17.12.3/src/searchwidget.h 2018-02-26 06:42:26.000000000 +0100 +++ new/akonadiconsole-18.04.0/src/searchwidget.h 2018-04-10 13:50:39.000000000 +0200 @@ -33,10 +33,8 @@ class QStandardItemModel; class QTreeView; class QSplitter; -namespace KPIMTextEdit -{ -class PlainTextEditorWidget; -} +class QPlainTextEdit; + namespace Xapian { class Database; class Error; @@ -58,10 +56,10 @@ private: void xapianError(const Xapian::Error &e); - + KComboBox *mStoreCombo = nullptr; QTextBrowser *mItemView = nullptr; - KPIMTextEdit::PlainTextEditorWidget *mQueryWidget = nullptr; + QPlainTextEdit *mQueryWidget = nullptr; QListView *mDatabaseView = nullptr; QStandardItemModel *mDocumentModel = nullptr; QTreeView *mDocumentView = nullptr;
