Implemented "unset dates" in the date navigator.

diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp
index c6d0a40a6a7cf5aa95380c002d670e50f2a599ba..e251f6f6a4f225ce4af5ee7c058e7766e11eaf38 100644 (file)
--- 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);
 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 de8cc225976b9e9e97d10cdbab8d9189bcc02840..d342e19b9fd643666794beca31ef40213b18e7a2 100644 (file)
--- 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 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();
     protected:
         void paintEvent(QPaintEvent *);
         void configureNavigation();

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 91a00e2b9e4ee582b9774ee4f862d9173213a68b..76e69ae4dc45d957af373577178cf42e0baf7ed6 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -112,13 +112,6 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
         clearTabs();
     }
 
         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)
     // 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());
         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();
 void MainWindow::unsetConference()
 {
     clearTabs();

+    dayNavigator->unsetDates();

     setWindowTitle(saved_title);
 }
 
     setWindowTitle(saved_title);
 }
 

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 48f91200d48d184f022a992519d4e2632f191eba..da291159b0e153961d5537b2946166ea44b49100 100644 (file)
--- 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));
 
     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 &)));
 
     connect(treeView, SIGNAL(eventHasChanged(int,bool)), SIGNAL(eventHasChanged(int,bool)));
     connect(treeView, SIGNAL(clicked(const QModelIndex &)), SLOT(itemClicked(const QModelIndex &)));