diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar index 4f4fbb3e..955e8309 160000 --- a/3th_libs/LunarCalendar +++ b/3th_libs/LunarCalendar @@ -1 +1 @@ -Subproject commit 4f4fbb3ed7cbeefa347ef4a33b1388cf13359966 +Subproject commit 955e830939f6ea1d44598b8a63790f4209a4ca2b diff --git a/Src/FrmCalendar.cpp b/Src/FrmCalendar.cpp index 4b656ab9..55e77c7a 100644 --- a/Src/FrmCalendar.cpp +++ b/Src/FrmCalendar.cpp @@ -22,7 +22,7 @@ class CTasksHandler : public CLunarCalendar::CGetTaskHandler CTasksHandler(CFrmCalendar* pFrmCalendar); virtual ~CTasksHandler(); - virtual int onHandle(QDate date); + virtual uint onHandle(/*in*/const QDate& date, /*out*/QStringList& tasks) override; private: CFrmCalendar* m_pFrmCalendar; }; @@ -37,9 +37,9 @@ CTasksHandler::~CTasksHandler() { } -int CTasksHandler::onHandle(QDate date) +uint CTasksHandler::onHandle(const QDate &date, QStringList &tasks) { - return m_pFrmCalendar->onHandle(date); + return m_pFrmCalendar->onHandle(date, tasks); } CFrmCalendar::CFrmCalendar(QWidget *parent) : @@ -70,7 +70,7 @@ CFrmCalendar::CFrmCalendar(QWidget *parent) : m_TasksList.Start(); m_pCalendar = new CLunarCalendar(this); - m_pCalendar->SetTouchUpDownFunction(CLunarCalendar::TouchChangeView); + m_pCalendar->SetTouchUpDownFunction(CLunarCalendar::_TOUCH_UP_DOWN_FUNCTION::TouchChangeView); m_pCalendar->SetTaskHandle(QSharedPointer( new CTasksHandler(this))); m_pCalendar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Maximum); @@ -268,9 +268,9 @@ void CFrmCalendar::slotSaveAs() void CFrmCalendar::slotViewWeek(bool checked) { if(checked) - m_pCalendar->SetViewType(CLunarCalendar::ViewTypeWeek); + m_pCalendar->SetViewType(CLunarCalendar::_VIEW_TYPE::ViewTypeWeek); else - m_pCalendar->SetViewType(CLunarCalendar::ViewTypeMonth); + m_pCalendar->SetViewType(CLunarCalendar::_VIEW_TYPE::ViewTypeMonth); } void CFrmCalendar::slotCalendarHead(bool checked) @@ -373,7 +373,7 @@ void CFrmCalendar::slotViewCustomContextMenuRequested(const QPoint& pos) m_ListViewMenu.popup(m_listView.mapToGlobal(pos)); } -int CFrmCalendar::onHandle(QDate date) +int CFrmCalendar::onHandle(/*in*/const QDate& date, /*out*/QStringList& t) { int nCount = 0; CTasksList::POSITION pos = m_TasksList.GetFirst(); @@ -391,6 +391,7 @@ int CFrmCalendar::onHandle(QDate date) if(pTask->CheckDate(date) == 0) { nCount++; + t << pTask->GetTitle(); } } } @@ -402,7 +403,6 @@ int CFrmCalendar::onHandle(QDate date) int CFrmCalendar::Update() { m_pCalendar->Update(); - onHandle(m_pCalendar->SelectedDate()); slotSelectionChanged(); //m_TasksList.Start(); return 0; diff --git a/Src/FrmCalendar.h b/Src/FrmCalendar.h index 8ca6629c..ebe424c6 100644 --- a/Src/FrmCalendar.h +++ b/Src/FrmCalendar.h @@ -21,7 +21,7 @@ class TASKS_EXPORT CFrmCalendar : public QWidget explicit CFrmCalendar(QWidget *parent = nullptr); virtual ~CFrmCalendar(); - virtual int onHandle(QDate date); + virtual int onHandle(const QDate &date, QStringList &t); private Q_SLOTS: void slotSelectionChanged();