From 1825f8254c4aaa2fe261356b7b0a9091ac471b46 Mon Sep 17 00:00:00 2001 From: Philipp Spitzer Date: Wed, 21 Sep 2011 21:49:43 +0000 Subject: [PATCH] Implemented "unset dates" in the date navigator. --- src/gui/daynavigatorwidget.cpp | 11 +++++++++++ src/gui/daynavigatorwidget.h | 1 + src/gui/mainwindow.cpp | 9 ++------- src/gui/tabcontainer.cpp | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp index c6d0a40..e251f6f 100644 --- a/src/gui/daynavigatorwidget.cpp +++ b/src/gui/daynavigatorwidget.cpp @@ -71,6 +71,17 @@ void DayNavigatorWidget::setCurDate(const QDate& curDate) { } +void DayNavigatorWidget::unsetDates() { + mStartDate= QDate(); + mEndDate = QDate(); + mCurDate = QDate(); + + configureNavigation(); + emit(dateChanged(mCurDate)); + this->update(); +} + + void DayNavigatorWidget::configureNavigation() { prevDayButton->setDisabled(!mStartDate.isValid() || mCurDate == mStartDate); nextDayButton->setDisabled(!mEndDate.isValid() || mCurDate == mEndDate); diff --git a/src/gui/daynavigatorwidget.h b/src/gui/daynavigatorwidget.h index de8cc22..d342e19 100644 --- a/src/gui/daynavigatorwidget.h +++ b/src/gui/daynavigatorwidget.h @@ -35,6 +35,7 @@ class DayNavigatorWidget : public QWidget, private Ui::DayNavigatorWidget { void setDates(const QDate &aStartDate, const QDate &aEndDate); void setCurDate(const QDate& curDate); QDate curDate() const {return mCurDate;} + void unsetDates(); protected: void paintEvent(QPaintEvent *); void configureNavigation(); diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 91a00e2..76e69ae 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -112,13 +112,6 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent) clearTabs(); } - // TODO: open conferences at startup? - #if 0 - if(!confCount) - tabWidget->setCurrentIndex(6); // 6 - conference tab - } - #endif - // open dialog for given Event ID // this is used in case Alarm Dialog request application to start if(aEventId) @@ -214,6 +207,7 @@ void MainWindow::initTabs() searchTabContainer->setDates(startDate, endDate); searchTabContainer->searchAgainClicked(); nowTabContainer->updateTreeView(QDate::currentDate()); + dayNavigator->setDates(startDate, endDate); } } @@ -231,6 +225,7 @@ void MainWindow::clearTabs() void MainWindow::unsetConference() { clearTabs(); + dayNavigator->unsetDates(); setWindowTitle(saved_title); } diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp index 48f9120..da29115 100644 --- a/src/gui/tabcontainer.cpp +++ b/src/gui/tabcontainer.cpp @@ -44,7 +44,7 @@ TabContainer::TabContainer(QWidget *aParent) treeView->setModel(new EventModel()); treeView->setItemDelegate(new Delegate(treeView)); - connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateTreeView(const QDate &))); + // connect(dayNavigator, SIGNAL(dateChanged(const QDate &)), SLOT(updateTreeView(const QDate &))); connect(treeView, SIGNAL(eventHasChanged(int,bool)), SIGNAL(eventHasChanged(int,bool))); connect(treeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &))); -- 2.39.5