From e9c677f5b26feaa16eb47bb9b3af949311fd93da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Sun, 13 Jan 2013 20:36:42 +0100 Subject: [PATCH] When user changes month or year in SearchBanner, A new date wasn't selected by default resulting in bad SQL query --- ChangeLog | 3 ++- src/view/SearchBanner.cpp | 15 +++++++++++++++ src/view/SearchBanner.hpp | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3216168..387b384 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -v0.4 (27/12/2012) +v0.4 (13/01/2013) ** User ** Add icons for low resolution Sort categories using translated names @@ -9,6 +9,7 @@ v0.4 (27/12/2012) ** Bugs ** Remove some bugs in GridAccount + When user changes month or year in SearchBanner, A new date wasn't selected by default resulting in bad SQL query v0.3 (31/05/2012) diff --git a/src/view/SearchBanner.cpp b/src/view/SearchBanner.cpp index 1495175..e178e86 100644 --- a/src/view/SearchBanner.cpp +++ b/src/view/SearchBanner.cpp @@ -42,6 +42,9 @@ SearchBanner::SearchBanner(KissCount* kiss, QFrame *parent, void* caller, OnButt // _calendarFrom->setNavigationBarVisible(false); _calendarFrom->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader); _calendarFrom->setMaximumSize(_calendarFrom->sizeHint()); + _calendarFrom->setSelectedDate(QDate::currentDate()); + + connect(_calendarFrom, SIGNAL(currentPageChanged(int, int)), this, SLOT(OnCalendarFromPageChanged(int, int))); _calendarTo = new QCalendarWidget(this); _calendarTo->setGridVisible(false); @@ -49,7 +52,9 @@ SearchBanner::SearchBanner(KissCount* kiss, QFrame *parent, void* caller, OnButt // _calendarTo->setNavigationBarVisible(false); _calendarTo->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader); _calendarTo->setMaximumSize(_calendarTo->sizeHint()); + _calendarTo->setSelectedDate(QDate::currentDate()); + connect(_calendarTo, SIGNAL(currentPageChanged(int, int)), this, SLOT(OnCalendarToPageChanged(int, int))); _description = new QLineEdit(this); _description->setMinimumWidth(_description->width()*2); @@ -122,6 +127,16 @@ SearchBanner::~SearchBanner() if (_operations) delete _operations; } +void SearchBanner::OnCalendarFromPageChanged(int year, int month) +{ + _calendarFrom->setSelectedDate(QDate(year, month, 1)); +} + +void SearchBanner::OnCalendarToPageChanged(int year, int month) +{ + _calendarTo->setSelectedDate(QDate(year, month, 1)); +} + std::vector * SearchBanner::Search() { QString *description=0; diff --git a/src/view/SearchBanner.hpp b/src/view/SearchBanner.hpp index 098e244..96455b3 100644 --- a/src/view/SearchBanner.hpp +++ b/src/view/SearchBanner.hpp @@ -39,6 +39,8 @@ public: private slots: void OnEnter(); + void OnCalendarFromPageChanged(int year, int month); + void OnCalendarToPageChanged(int year, int month); private: KissCount* _kiss;