Commit 663cfb17 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use new class from calendarsupport

parent 95225cf8
Pipeline #23524 passed with stage
in 23 minutes and 5 seconds
...@@ -34,7 +34,7 @@ set(QT_REQUIRED_VERSION "5.13.0") ...@@ -34,7 +34,7 @@ set(QT_REQUIRED_VERSION "5.13.0")
set(AKONADICALENDAR_LIB_VERSION "5.14.40") set(AKONADICALENDAR_LIB_VERSION "5.14.40")
set(KMIME_LIB_VERSION "5.14.40") set(KMIME_LIB_VERSION "5.14.40")
set(LIBKDEPIM_LIB_VERSION "5.14.40") set(LIBKDEPIM_LIB_VERSION "5.14.40")
set(CALENDARSUPPORT_LIB_VERSION "5.14.40") set(CALENDARSUPPORT_LIB_VERSION "5.14.42")
find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include <CalendarSupport/KCalPrefs> #include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils> #include <CalendarSupport/Utils>
#include <Libkdepim/KDatePickerPopup> #include <CalendarSupport/KDatePickerPopup>
#include <KCalendarCore/CalFormat> #include <KCalendarCore/CalFormat>
...@@ -399,25 +399,25 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs, bool sidebarView, QWidget ...@@ -399,25 +399,25 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs, bool sidebarView, QWidget
mItemPopupMenu->addSeparator(); mItemPopupMenu->addSeparator();
mCopyPopupMenu = new KPIM::KDatePickerPopup(KPIM::KDatePickerPopup::NoDate mCopyPopupMenu = new CalendarSupport::KDatePickerPopup(CalendarSupport::KDatePickerPopup::NoDate
|KPIM::KDatePickerPopup::DatePicker |CalendarSupport::KDatePickerPopup::DatePicker
|KPIM::KDatePickerPopup::Words, |CalendarSupport::KDatePickerPopup::Words,
QDate::currentDate(), this); QDate::currentDate(), this);
mCopyPopupMenu->setTitle(i18nc("@title:menu", "&Copy To")); mCopyPopupMenu->setTitle(i18nc("@title:menu", "&Copy To"));
connect(mCopyPopupMenu, &KPIM::KDatePickerPopup::dateChanged, this, &TodoView::copyTodoToDate); connect(mCopyPopupMenu, &CalendarSupport::KDatePickerPopup::dateChanged, this, &TodoView::copyTodoToDate);
connect(mCopyPopupMenu, &KPIM::KDatePickerPopup::dateChanged, mItemPopupMenu, &QMenu::hide); connect(mCopyPopupMenu, &CalendarSupport::KDatePickerPopup::dateChanged, mItemPopupMenu, &QMenu::hide);
mMovePopupMenu = new KPIM:: KDatePickerPopup(KPIM::KDatePickerPopup::NoDate mMovePopupMenu = new CalendarSupport:: KDatePickerPopup(CalendarSupport::KDatePickerPopup::NoDate
|KPIM::KDatePickerPopup::DatePicker |CalendarSupport::KDatePickerPopup::DatePicker
|KPIM::KDatePickerPopup::Words, |CalendarSupport::KDatePickerPopup::Words,
QDate::currentDate(), this); QDate::currentDate(), this);
mMovePopupMenu->setTitle(i18nc("@title:menu", "&Move To")); mMovePopupMenu->setTitle(i18nc("@title:menu", "&Move To"));
connect(mMovePopupMenu, &KPIM::KDatePickerPopup::dateChanged, this, &TodoView::setNewDate); connect(mMovePopupMenu, &CalendarSupport::KDatePickerPopup::dateChanged, this, &TodoView::setNewDate);
connect(mMovePopupMenu, &KPIM::KDatePickerPopup::dateChanged, mItemPopupMenu, &QMenu::hide); connect(mMovePopupMenu, &CalendarSupport::KDatePickerPopup::dateChanged, mItemPopupMenu, &QMenu::hide);
mItemPopupMenu->insertMenu(nullptr, mCopyPopupMenu); mItemPopupMenu->insertMenu(nullptr, mCopyPopupMenu);
mItemPopupMenu->insertMenu(nullptr, mMovePopupMenu); mItemPopupMenu->insertMenu(nullptr, mMovePopupMenu);
......
...@@ -41,7 +41,7 @@ class TodoViewQuickSearch; ...@@ -41,7 +41,7 @@ class TodoViewQuickSearch;
class TodoViewSortFilterProxyModel; class TodoViewSortFilterProxyModel;
class TodoViewView; class TodoViewView;
namespace KPIM { namespace CalendarSupport {
class KDatePickerPopup; class KDatePickerPopup;
} }
...@@ -167,8 +167,8 @@ private: ...@@ -167,8 +167,8 @@ private:
QToolButton *mFlatViewButton = nullptr; QToolButton *mFlatViewButton = nullptr;
QMenu *mItemPopupMenu = nullptr; QMenu *mItemPopupMenu = nullptr;
KPIM::KDatePickerPopup *mCopyPopupMenu = nullptr; CalendarSupport::KDatePickerPopup *mCopyPopupMenu = nullptr;
KPIM::KDatePickerPopup *mMovePopupMenu = nullptr; CalendarSupport::KDatePickerPopup *mMovePopupMenu = nullptr;
QMenu *mPriorityPopupMenu = nullptr; QMenu *mPriorityPopupMenu = nullptr;
QMenu *mPercentageCompletedPopupMenu = nullptr; QMenu *mPercentageCompletedPopupMenu = nullptr;
QList<QAction *> mItemPopupMenuItemOnlyEntries; QList<QAction *> mItemPopupMenuItemOnlyEntries;
......
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