Hello community, here is the log from the commit of package akonadiconsole for openSUSE:Factory checked in at 2019-01-08 12:19:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadiconsole (Old) and /work/SRC/openSUSE:Factory/.akonadiconsole.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadiconsole" Tue Jan 8 12:19:53 2019 rev:26 rq:658311 version:18.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadiconsole/akonadiconsole.changes 2018-11-13 16:45:10.784864438 +0100 +++ /work/SRC/openSUSE:Factory/.akonadiconsole.new.28833/akonadiconsole.changes 2019-01-08 12:19:54.648837843 +0100 @@ -1,0 +2,49 @@ +Fri Dec 14 06:08:38 UTC 2018 - [email protected] + +- Update to 18.12.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.0.php +- Changes since 18.11.90: + * No code changes since 18.11.90 + +------------------------------------------------------------------- +Wed Dec 5 10:24:42 UTC 2018 - Jan Engelhardt <[email protected]> + +- Trim bias and filler wording from description. + +------------------------------------------------------------------- +Mon Dec 03 20:55:43 UTC 2018 - [email protected] + +- Update to 18.11.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-rc.php +- Changes since 18.11.80: + * No code changes since 18.11.80 + +------------------------------------------------------------------- +Tue Nov 20 06:21:44 UTC 2018 - Luca Beltrame <[email protected]> + +- Run spec-cleaner + +------------------------------------------------------------------- +Tue Nov 20 05:56:32 UTC 2018 - [email protected] + +- Update to 18.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-beta.php +- Changes since 18.08.3: + * Browser: fix tag fetch scope + * Debugger: enable pixel scrolling + * Fix dependancy + * Fix build against latest Akonadi protocol changes + * Use KDEFrameworkCompilerSettings and make it compiles + * It's not akonadicontact but akonadi + * Add menu actions to trigger tag and relation sync + * Use the new in-process agent configuration UI + * Add support for MustRetrieve notification field + * Use new syntax + +------------------------------------------------------------------- @@ -51 +100 @@ - * https://www.kde.org/announcements/announce-applications-18.07.80.php + * https://www.kde.org/announcements/announce-applications-18.08-beta.php @@ -111 +160 @@ - * https://www.kde.org/announcements/announce-applications-18.03.90.php + * https://www.kde.org/announcements/announce-applications-18.04-rc.php @@ -230 +279 @@ - * https://www.kde.org/announcements/announce-applications-17.07.90.php + * https://www.kde.org/announcements/announce-applications-17.08-rc.php @@ -294 +343 @@ - * https://www.kde.org/announcements/announce-applications-17.03.80.php + * https://www.kde.org/announcements/announce-applications-17.04-beta.php Old: ---- akonadiconsole-18.08.3.tar.xz New: ---- akonadiconsole-18.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadiconsole.spec ++++++ --- /var/tmp/diff_new_pack.zeh7US/_old 2019-01-08 12:19:55.144837294 +0100 +++ /var/tmp/diff_new_pack.zeh7US/_new 2019-01-08 12:19:55.144837294 +0100 @@ -16,16 +16,16 @@ # -Name: akonadiconsole -Version: 18.08.3 -Release: 0 %define kf5_version 5.28.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +Name: akonadiconsole +Version: 18.12.0 +Release: 0 Summary: Management and debugging console for akonadi License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/KDE -Url: http://www.kde.org +URL: http://www.kde.org Source0: %{name}-%{version}.tar.xz BuildRequires: akonadi-contact-devel BuildRequires: akonadi-mime-devel @@ -62,17 +62,16 @@ BuildRequires: pkgconfig(Qt5Test) >= 5.6.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.6.0 Obsoletes: akonadi_resources < %{version} +# It can only build on the same platforms as Qt Webengine +ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 %if %{with lang} Recommends: %{name}-lang %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# It can only build on the same platforms as Qt Webengine -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 %description -Akonadi Console is a useful utility that can be used to explore or -manage Akonadi. Since this utility exposes Akonadi internals, it is -very useful for debugging but may also prove handy in other cases. +Akonadi Console is a utility that can be used to explore or manage +Akonadi. This utility exposes Akonadi internals, and can be useful +for debugging. %prep %setup -q @@ -86,12 +85,10 @@ %suse_update_desktop_file -u org.kde.akonadiconsole Network Email %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc COPYING COPYING.LIB COPYING.DOC +%license COPYING COPYING.LIB COPYING.DOC %config %{_kf5_configdir}/akonadiconsole.categories %config %{_kf5_configdir}/akonadiconsole.renamecategories %dir %{_kf5_iconsdir}/hicolor/256x256 ++++++ akonadiconsole-18.08.3.tar.xz -> akonadiconsole-18.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/CMakeLists.txt new/akonadiconsole-18.12.0/CMakeLists.txt --- old/akonadiconsole-18.08.3/CMakeLists.txt 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/CMakeLists.txt 2018-12-03 13:06:30.000000000 +0100 @@ -1,30 +1,30 @@ cmake_minimum_required(VERSION 3.1) -set(KDEPIM_VERSION_NUMBER "5.9.3") +set(KDEPIM_VERSION_NUMBER "5.10.0") project(akonadiconsole VERSION ${KDEPIM_VERSION_NUMBER}) -set(KF5_VERSION "5.47.0") +set(KF5_VERSION "5.51.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(ECMInstallIcons) -include(ECMOptionalAddSubdirectory) + include(ECMSetupVersion) include(ECMAddTests) -include(ECMMarkNonGuiExecutable) + include(GenerateExportHeader) include(ECMGenerateHeaders) -include(CMakePackageConfigHelpers) + include(FeatureSummary) include(CheckFunctionExists) include(ECMGeneratePriFile) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDECompilerSettings NO_POLICY_SCOPE) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) -include(ECMCoverageOption) + # Do NOT add quote set(KDEPIM_DEV_VERSION) @@ -40,10 +40,10 @@ set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") -set(AKONADI_CONTACT_VERSION "5.9.3") -set(CALENDARSUPPORT_LIB_VERSION_LIB "5.9.3") -set(AKONADI_VERSION "5.9.3") -set(AKONADI_SEARCH_VERSION "5.9.3") +set(AKONADI_CONTACT_VERSION "5.10.0") +set(CALENDARSUPPORT_LIB_VERSION_LIB "5.10.0") +set(AKONADI_VERSION "5.10.0") +set(AKONADI_SEARCH_VERSION "5.10.0") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") @@ -51,11 +51,11 @@ set(QT_REQUIRED_VERSION "5.9.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) -set(MESSAGELIB_LIB_VERSION_LIB "5.9.3") -set(LIBKDEPIM_LIB_VERSION_LIB "5.9.3") -set(KCALENDARCORE_LIB_VERSION "5.9.3") -set(KCONTACTS_LIB_VERSION "5.9.3") -set(KMIME_LIB_VERSION "5.9.3") +set(MESSAGELIB_LIB_VERSION_LIB "5.10.0") +set(LIBKDEPIM_LIB_VERSION_LIB "5.10.0") +set(KCALENDARCORE_LIB_VERSION "5.10.0") +set(KCONTACTS_LIB_VERSION "5.10.0") +set(KMIME_LIB_VERSION "5.10.0") # Find KF5 package find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED) @@ -102,9 +102,6 @@ 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) install( FILES akonadiconsole.renamecategories akonadiconsole.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/akonadiconsole.categories new/akonadiconsole-18.12.0/akonadiconsole.categories --- old/akonadiconsole-18.08.3/akonadiconsole.categories 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/akonadiconsole.categories 2018-12-03 13:06:30.000000000 +0100 @@ -1 +1 @@ -org.kde.pim.akonadiconsole akonadiconsole (akonadiconsole) +org.kde.pim.akonadiconsole akonadiconsole (akonadiconsole) IDENTIFIER [AKONADICONSOLE_LOG] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/autotests/jobtrackermodeltest.cpp new/akonadiconsole-18.12.0/autotests/jobtrackermodeltest.cpp --- old/akonadiconsole-18.08.3/autotests/jobtrackermodeltest.cpp 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/autotests/jobtrackermodeltest.cpp 2018-12-03 13:06:30.000000000 +0100 @@ -51,7 +51,7 @@ void JobTrackerModelTest::initTestCase() { // Don't interfere with a running akonadiconsole - Akonadi::Instance::setIdentifier("jobtrackertest"); + Akonadi::Instance::setIdentifier(QStringLiteral("jobtrackertest")); } void JobTrackerModelTest::shouldBeEmpty() @@ -66,7 +66,7 @@ // GIVEN JobTrackerModel model("jobtracker"); //ModelTest modelTest(&model); - const QString jobName("job1"); + const QString jobName(QStringLiteral("job1")); QSignalSpy rowATBISpy(&model, &QAbstractItemModel::rowsAboutToBeInserted); QSignalSpy rowInsertedSpy(&model, &QAbstractItemModel::rowsInserted); connect(&model, &QAbstractItemModel::rowsAboutToBeInserted, @@ -89,7 +89,7 @@ }); // WHEN - model.jobTracker().jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + model.jobTracker().jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); // THEN QCOMPARE(model.rowCount(), 1); @@ -110,8 +110,8 @@ { // GIVEN JobTrackerModel model("jobtracker"); - const QString jobName("job1"); - model.jobTracker().jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + const QString jobName(QStringLiteral("job1")); + model.jobTracker().jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); QSignalSpy dataChangedSpy(&model, &JobTrackerModel::dataChanged); // WHEN @@ -133,8 +133,8 @@ { // GIVEN JobTrackerModel model("jobtracker"); - const QString jobName("job1"); - model.jobTracker().jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + const QString jobName(QStringLiteral("job1")); + model.jobTracker().jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); QSignalSpy modelATBResetSpy(&model, &JobTrackerModel::modelAboutToBeReset); QSignalSpy modelResetSpy(&model, &JobTrackerModel::modelReset); QSignalSpy dataChangedSpy(&model, &JobTrackerModel::dataChanged); @@ -157,8 +157,8 @@ { // GIVEN JobTrackerModel model("jobtracker"); - const QString jobName("job1"); - model.jobTracker().jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + const QString jobName(QStringLiteral("job1")); + model.jobTracker().jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); model.jobTracker().jobStarted(jobName); model.jobTracker().jobEnded(jobName, QString()); model.jobTracker().signalUpdates(); @@ -166,7 +166,7 @@ // WHEN QSignalSpy rowATBISpy(&model, &QAbstractItemModel::rowsAboutToBeInserted); QSignalSpy rowInsertedSpy(&model, &QAbstractItemModel::rowsInserted); - model.jobTracker().jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + model.jobTracker().jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); // THEN QCOMPARE(model.rowCount(), 1); // 1 session diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/autotests/jobtrackermodeltest.h new/akonadiconsole-18.12.0/autotests/jobtrackermodeltest.h --- old/akonadiconsole-18.08.3/autotests/jobtrackermodeltest.h 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/autotests/jobtrackermodeltest.h 2018-12-03 13:06:30.000000000 +0100 @@ -28,7 +28,7 @@ public: explicit JobTrackerModelTest(QObject *parent = nullptr); ~JobTrackerModelTest(); -private slots: +private Q_SLOTS: void initTestCase(); void shouldBeEmpty(); void shouldDisplayOneJob(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/autotests/jobtrackertest.cpp new/akonadiconsole-18.12.0/autotests/jobtrackertest.cpp --- old/akonadiconsole-18.08.3/autotests/jobtrackertest.cpp 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/autotests/jobtrackertest.cpp 2018-12-03 13:06:30.000000000 +0100 @@ -28,9 +28,9 @@ QString ret; for (const auto &pair : arg) { if (!ret.isEmpty()) { - ret += ' '; + ret += QLatin1Char(' '); } - ret += QString::number(pair.first) + ',' + QString::number(pair.second); + ret += QString::number(pair.first) + QLatin1Char(',') + QString::number(pair.second); } return ret; } @@ -47,7 +47,7 @@ void JobTrackerTest::initTestCase() { // Don't interfere with a running akonadiconsole - Akonadi::Instance::setIdentifier("jobtrackertest"); + Akonadi::Instance::setIdentifier(QStringLiteral("jobtrackertest")); qRegisterMetaType<QList<QPair<int, int>>>(); } @@ -63,17 +63,17 @@ { // GIVEN JobTracker tracker("jobtracker"); - const QString jobName("job1"); + const QString jobName(QStringLiteral("job1")); QSignalSpy spyAboutToAdd(&tracker, &JobTracker::aboutToAdd); QSignalSpy spyUpdated(&tracker, &JobTracker::updated); // WHEN - tracker.jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + tracker.jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); // THEN QCOMPARE(tracker.sessions().count(), 1); QCOMPARE(tracker.sessions().at(0), QStringLiteral("session1")); - QCOMPARE(tracker.idForSession("session1"), -2); + QCOMPARE(tracker.idForSession(QStringLiteral("session1")), -2); QCOMPARE(tracker.sessionForId(-2), QStringLiteral("session1")); QCOMPARE(tracker.parentId(-2), -1); QCOMPARE(tracker.jobCount(-2), 1); @@ -97,8 +97,8 @@ { // GIVEN JobTracker tracker("jobtracker"); - const QString jobName("job1"); - tracker.jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + const QString jobName(QStringLiteral("job1")); + tracker.jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); tracker.signalUpdates(); QSignalSpy spyAdded(&tracker, &JobTracker::added); QSignalSpy spyUpdated(&tracker, &JobTracker::updated); @@ -120,15 +120,15 @@ { // GIVEN JobTracker tracker("jobtracker"); - const QString jobName("job1"); - tracker.jobCreated("session1", jobName, QString(), "type1", "debugStr1"); + const QString jobName(QStringLiteral("job1")); + tracker.jobCreated(QStringLiteral("session1"), jobName, QString(), QStringLiteral("type1"), QStringLiteral("debugStr1")); tracker.jobStarted(jobName); tracker.signalUpdates(); QSignalSpy spyAdded(&tracker, &JobTracker::added); QSignalSpy spyUpdated(&tracker, &JobTracker::updated); // WHEN - tracker.jobEnded("job1", "errorString"); + tracker.jobEnded(QStringLiteral("job1"), QStringLiteral("errorString")); // THEN QCOMPARE(tracker.info(42).state, JobInfo::Failed); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/autotests/jobtrackertest.h new/akonadiconsole-18.12.0/autotests/jobtrackertest.h --- old/akonadiconsole-18.08.3/autotests/jobtrackertest.h 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/autotests/jobtrackertest.h 2018-12-03 13:06:30.000000000 +0100 @@ -28,7 +28,7 @@ public: explicit JobTrackerTest(QObject *parent = nullptr); ~JobTrackerTest(); -private slots: +private Q_SLOTS: void initTestCase(); void shouldBeEmpty(); void shouldDisplayOneJob(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/src/CMakeLists.txt new/akonadiconsole-18.12.0/src/CMakeLists.txt --- old/akonadiconsole-18.08.3/src/CMakeLists.txt 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/src/CMakeLists.txt 2018-12-03 13:06:30.000000000 +0100 @@ -1,9 +1,6 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) -add_definitions(-DQT_NO_CAST_FROM_ASCII) -add_definitions(-DQT_NO_CAST_TO_ASCII) - add_subdirectory(icons) add_subdirectory(kconf_update) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/src/agentwidget.cpp new/akonadiconsole-18.12.0/src/agentwidget.cpp --- old/akonadiconsole-18.08.3/src/agentwidget.cpp 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/src/agentwidget.cpp 2018-12-03 13:06:30.000000000 +0100 @@ -29,6 +29,7 @@ #include <AkonadiCore/AgentFilterProxyModel> #include <AkonadiCore/agentinstancecreatejob.h> #include <AkonadiWidgets/controlgui.h> +#include <AkonadiWidgets/AgentConfigurationDialog> #include <KLocalizedString> #include <KMessageBox> @@ -113,6 +114,18 @@ mSyncMenu = new QMenu(QStringLiteral("Synchronize"), this); mSyncMenu->addAction(QStringLiteral("Synchronize All"), this, &AgentWidget::synchronizeAgent); mSyncMenu->addAction(QStringLiteral("Synchronize Collection Tree"), this, &AgentWidget::synchronizeTree); + mSyncMenu->addAction(QStringLiteral("Synchronize Tags"), this, [this]() { + const AgentInstance::List list = ui.instanceWidget->selectedAgentInstances(); + for (auto agent : list) { + agent.synchronizeTags(); + } + }); + mSyncMenu->addAction(QStringLiteral("Synchronize Relations"), this, [this]() { + const auto list = ui.instanceWidget->selectedAgentInstances(); + for (auto agent : list) { + agent.synchronizeRelations(); + } + }); mSyncMenu->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh"))); ui.syncButton->setMenu(mSyncMenu); ui.syncButton->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh"))); @@ -209,7 +222,9 @@ { AgentInstance agent = ui.instanceWidget->currentAgentInstance(); if (agent.isValid()) { - agent.configure(this); + QPointer<AgentConfigurationDialog> dlg = new AgentConfigurationDialog(agent, this); + dlg->exec(); + delete dlg; } } @@ -295,19 +310,17 @@ void AgentWidget::synchronizeTree() { const AgentInstance::List list = ui.instanceWidget->selectedAgentInstances(); - if (!list.isEmpty()) - for (AgentInstance agent : list) { - agent.synchronizeCollectionTree(); - } + for (AgentInstance agent : list) { + agent.synchronizeCollectionTree(); + } } void AgentWidget::abortAgent() { const AgentInstance::List list = ui.instanceWidget->selectedAgentInstances(); - if (!list.isEmpty()) - for (const AgentInstance &agent : list) { - agent.abortCurrentTask(); - } + for (const AgentInstance &agent : list) { + agent.abortCurrentTask(); + } } void AgentWidget::restartAgent() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/src/browserwidget.cpp new/akonadiconsole-18.12.0/src/browserwidget.cpp --- old/akonadiconsole-18.08.3/src/browserwidget.cpp 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/src/browserwidget.cpp 2018-12-03 13:06:30.000000000 +0100 @@ -49,6 +49,7 @@ #include <AkonadiCore/tagmodel.h> #include <AkonadiCore/statisticsproxymodel.h> #include <AkonadiCore/tagdeletejob.h> +#include <AkonadiCore/TagFetchScope> #include <AkonadiXml/XmlWriteJob> #include <kviewstatemaintainer.h> @@ -305,6 +306,9 @@ job->fetchScope().fetchFullPayload(); job->fetchScope().fetchAllAttributes(); job->fetchScope().setFetchTags(true); + auto &tfs = job->fetchScope().tagFetchScope(); + tfs.setFetchIdOnly(false); + tfs.fetchAllAttributes(); connect(job, &ItemFetchJob::result, this, &BrowserWidget::itemFetchDone); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/src/connectionpage.cpp new/akonadiconsole-18.12.0/src/connectionpage.cpp --- old/akonadiconsole-18.08.3/src/connectionpage.cpp 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/src/connectionpage.cpp 2018-12-03 13:06:30.000000000 +0100 @@ -60,6 +60,7 @@ mDataView->setModel(mFilterModel); mDataView->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont)); mDataView->horizontalHeader()->setStretchLastSection(true); + mDataView->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); layout->addWidget(mDataView); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/src/monitorswidget.cpp new/akonadiconsole-18.12.0/src/monitorswidget.cpp --- old/akonadiconsole-18.08.3/src/monitorswidget.cpp 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/src/monitorswidget.cpp 2018-12-03 13:06:30.000000000 +0100 @@ -175,16 +175,12 @@ appendRow(ifsItem, QStringLiteral("Fetch RID"), toString(ifs.fetchRemoteIdentification())); appendRow(ifsItem, QStringLiteral("Fetch Tags"), toString(ifs.fetchTags())); - auto tfsItem = new QStandardItem(QStringLiteral("Tag Fetch Scope")); - populateTagFetchScope(tfsItem, ifs.tagFetchScope()); - model->appendRow(ifsItem); - const auto cfs = subscriber.collectionFetchScope(); auto cfsItem = new QStandardItem(QStringLiteral("Collection Fetch Scope")); populateCollectionFetchScope(cfsItem, cfs); auto tagScope = new QStandardItem(QStringLiteral("Tag Fetch Scope")); - populateTagFetchScope(tagScope, ifs.tagFetchScope()); + populateTagFetchScope(tagScope, subscriber.tagFetchScope()); model->appendRow(tagScope); mSubscriberView->expandAll(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/src/notificationmonitor.cpp new/akonadiconsole-18.12.0/src/notificationmonitor.cpp --- old/akonadiconsole-18.08.3/src/notificationmonitor.cpp 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/src/notificationmonitor.cpp 2018-12-03 13:06:30.000000000 +0100 @@ -249,6 +249,9 @@ } model->appendRow(relationsItem); + appendRow(model, QStringLiteral("Must retrieve"), + toString(ntf.mustRetrieve())); + auto itemsItem = new QStandardItem(QStringLiteral("Items")); const auto &items = ntf.items(); for (const auto &item : items) { @@ -543,7 +546,6 @@ const auto ifs = ntf.itemFetchScope(); appendRow(item, QStringLiteral("Requested Parts"), toString(ifs.requestedParts())); appendRow(item, QStringLiteral("Changed Since"), ifs.changedSince().toString(Qt::ISODateWithMs)); - appendRow(item, QStringLiteral("Tag Fetch Scope"), toString(ifs.tagFetchScope())); QString ancestorDepth; switch (ifs.ancestorDepth()) { case Akonadi::Protocol::ItemFetchScope::NoAncestor: @@ -617,6 +619,14 @@ appendRow(item, QStringLiteral("Ancestor Attributes"), toString(cfs.ancestorAttributes())); appendRow(item, QStringLiteral("Ignore Retrieval Errors"), toString(cfs.ignoreRetrievalErrors())); model->appendRow(item); + + item = new QStandardItem(QStringLiteral("Tag Fetch Scope")); + const Akonadi::Protocol::TagFetchScope tfs = ntf.tagFetchScope(); + appendRow(item, QStringLiteral("Fetch ID Only"), toString(tfs.fetchIdOnly())); + appendRow(item, QStringLiteral("Fetch RemoteID"), toString(tfs.fetchRemoteID())); + appendRow(item, QStringLiteral("Fetch All Attributes"), toString(tfs.fetchAllAttributes())); + appendRow(item, QStringLiteral("Attributes"), toString(tfs.attributes())); + model->appendRow(item); } void NotificationMonitor::saveToFile() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadiconsole-18.08.3/src/org.kde.akonadiconsole.desktop new/akonadiconsole-18.12.0/src/org.kde.akonadiconsole.desktop --- old/akonadiconsole-18.08.3/src/org.kde.akonadiconsole.desktop 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/src/org.kde.akonadiconsole.desktop 2018-12-03 13:06:30.000000000 +0100 @@ -1,7 +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 Name[cs]=Konzole Akonadi @@ -37,7 +36,6 @@ Type=Application Comment=Akonadi Management and Debugging Console Comment[ar]=معراض لإدارة وتنقيح «أكونادي» -Comment[ast]=Consola de depuración y xestión d'Akonadi 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-18.08.3/src/searchwidget.cpp new/akonadiconsole-18.12.0/src/searchwidget.cpp --- old/akonadiconsole-18.08.3/src/searchwidget.cpp 2018-10-26 07:58:48.000000000 +0200 +++ new/akonadiconsole-18.12.0/src/searchwidget.cpp 2018-12-03 13:06:30.000000000 +0100 @@ -58,7 +58,7 @@ QVBoxLayout *layout = new QVBoxLayout(this); QHBoxLayout *hbox = new QHBoxLayout; - hbox->addWidget(new QLabel(QStringLiteral("Search store:")), 0, 0); + hbox->addWidget(new QLabel(QStringLiteral("Search store:")), 0, {}); mStoreCombo = new KComboBox; mStoreCombo->setObjectName(QStringLiteral("SearchStoreCombo")); hbox->addWidget(mStoreCombo);
