Commit 905fda17 authored by David Faure's avatar David Faure
Browse files

IncidenceEditor: pass ETM to CollectionCombobox, if it was set

Summary:
If it's nullptr, then CollectionCombobox will create an ETM internally,
juts like before.

Depends on D28556

Test Plan: incidence dialog is much faster

Reviewers: vkrause, mlaurent, winterz

Reviewed By: mlaurent

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D28557
parent 75e53fdc
......@@ -42,6 +42,7 @@ set(LIBKDEPIM_LIB_VERSION "5.14.40")
set(EVENTVIEW_LIB_VERSION "5.14.40")
set(AKONADI_VERSION "5.14.40")
set(AKONADICONTACT_LIB_VERSION "5.14.40")
set(AKONADICALENDAR_LIB_VERSION "5.14.41")
set(KDIAGRAM_LIB_VERSION "1.4.0")
find_package(KGantt ${KDIAGRAM_LIB_VERSION} CONFIG REQUIRED)
......@@ -64,6 +65,7 @@ find_package(KF5CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
ecm_setup_version(PROJECT VARIABLE_PREFIX INCIDENCEEDITOR
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/incidenceeditor_version.h"
......
......@@ -45,6 +45,7 @@
#include <CollectionComboBox>
#include <Item>
#include <Akonadi/Calendar/ETMCalendar>
#include <AkonadiCore/EntityTreeModel>
#include <KCalendarCore/ICalFormat>
#include <KCalendarCore/MemoryCalendar>
......@@ -128,7 +129,7 @@ public:
IncidenceDialogPrivate::IncidenceDialogPrivate(Akonadi::IncidenceChanger *changer, IncidenceDialog *qq)
: q_ptr(qq)
, mUi(new Ui::EventOrTodoDesktop)
, mCalSelector(new Akonadi::CollectionComboBox)
, mCalSelector(new Akonadi::CollectionComboBox(changer->entityTreeModel()))
, mCloseOnSave(false)
, mItemManager(new EditorItemManager(this, changer))
, mEditor(new CombinedIncidenceEditor(qq))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment