Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM EventViews
Commits
663cfb17
Commit
663cfb17
authored
Jun 14, 2020
by
Laurent Montel
😁
Browse files
Use new class from calendarsupport
parent
95225cf8
Pipeline
#23524
passed with stage
in 23 minutes and 5 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
663cfb17
...
...
@@ -34,7 +34,7 @@ set(QT_REQUIRED_VERSION "5.13.0")
set
(
AKONADICALENDAR_LIB_VERSION
"5.14.40"
)
set
(
KMIME_LIB_VERSION
"5.14.40"
)
set
(
LIBKDEPIM_LIB_VERSION
"5.14.40"
)
set
(
CALENDARSUPPORT_LIB_VERSION
"5.14.4
0
"
)
set
(
CALENDARSUPPORT_LIB_VERSION
"5.14.4
2
"
)
find_package
(
KF5Akonadi
${
AKONADI_LIB_VERSION
}
CONFIG REQUIRED
)
find_package
(
Qt5
${
QT_REQUIRED_VERSION
}
CONFIG REQUIRED Widgets
)
...
...
src/todo/todoview.cpp
View file @
663cfb17
...
...
@@ -45,7 +45,7 @@
#include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/Utils>
#include <
Libkdepim
/KDatePickerPopup>
#include <
CalendarSupport
/KDatePickerPopup>
#include <KCalendarCore/CalFormat>
...
...
@@ -399,25 +399,25 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs, bool sidebarView, QWidget
mItemPopupMenu
->
addSeparator
();
mCopyPopupMenu
=
new
KPIM
::
KDatePickerPopup
(
KPIM
::
KDatePickerPopup
::
NoDate
|
KPIM
::
KDatePickerPopup
::
DatePicker
|
KPIM
::
KDatePickerPopup
::
Words
,
mCopyPopupMenu
=
new
CalendarSupport
::
KDatePickerPopup
(
CalendarSupport
::
KDatePickerPopup
::
NoDate
|
CalendarSupport
::
KDatePickerPopup
::
DatePicker
|
CalendarSupport
::
KDatePickerPopup
::
Words
,
QDate
::
currentDate
(),
this
);
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
|
KPIM
::
KDatePickerPopup
::
DatePicker
|
KPIM
::
KDatePickerPopup
::
Words
,
mMovePopupMenu
=
new
CalendarSupport
::
KDatePickerPopup
(
CalendarSupport
::
KDatePickerPopup
::
NoDate
|
CalendarSupport
::
KDatePickerPopup
::
DatePicker
|
CalendarSupport
::
KDatePickerPopup
::
Words
,
QDate
::
currentDate
(),
this
);
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
,
mMovePopupMenu
);
...
...
src/todo/todoview.h
View file @
663cfb17
...
...
@@ -41,7 +41,7 @@ class TodoViewQuickSearch;
class
TodoViewSortFilterProxyModel
;
class
TodoViewView
;
namespace
KPIM
{
namespace
CalendarSupport
{
class
KDatePickerPopup
;
}
...
...
@@ -167,8 +167,8 @@ private:
QToolButton
*
mFlatViewButton
=
nullptr
;
QMenu
*
mItemPopupMenu
=
nullptr
;
KPIM
::
KDatePickerPopup
*
mCopyPopupMenu
=
nullptr
;
KPIM
::
KDatePickerPopup
*
mMovePopupMenu
=
nullptr
;
CalendarSupport
::
KDatePickerPopup
*
mCopyPopupMenu
=
nullptr
;
CalendarSupport
::
KDatePickerPopup
*
mMovePopupMenu
=
nullptr
;
QMenu
*
mPriorityPopupMenu
=
nullptr
;
QMenu
*
mPercentageCompletedPopupMenu
=
nullptr
;
QList
<
QAction
*>
mItemPopupMenuItemOnlyEntries
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment