search tab - header is hidden in case no conf exists in the DB

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index b5882d64abe389d468d998a6be4227f5034c8a24..1d8bf0a0580e29b9069f9cbfffab6392191032ee 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -135,8 +135,9 @@ void MainWindow::initTabs()
     dayTabContainer->setDates(startDate, endDate);
     tracksTabContainer->setDates(startDate, endDate);
     roomsTabContainer->setDates(startDate, endDate);
     dayTabContainer->setDates(startDate, endDate);
     tracksTabContainer->setDates(startDate, endDate);
     roomsTabContainer->setDates(startDate, endDate);

-    favsTabContainer->setDates(startDate, endDate);
-    searchTabContainer->setDates(startDate, endDate);
+    //favsTabContainer->setDates(startDate, endDate);
+    //searchTabContainer->setDates(startDate, endDate);
+    searchTabContainer->searchAgainClicked();

     nowTabContainer->updateTreeView(QDate::currentDate());
 }
 
     nowTabContainer->updateTreeView(QDate::currentDate());
 }
 

diff --git a/src/gui/searchtabcontainer.cpp b/src/gui/searchtabcontainer.cpp
index b69b6641b627f54d6e89002ffd6bbd65f44c2220..310d6923fa4c0095ffda178a229374ee4b6abfda 100644 (file)
--- a/src/gui/searchtabcontainer.cpp
+++ b/src/gui/searchtabcontainer.cpp
@@ -34,6 +34,11 @@ SearchTabContainer::SearchTabContainer(QWidget *aParent) : TabContainer( aParent
 
     searchAgainButton->hide();
     treeView->hide();
 
     searchAgainButton->hide();
     treeView->hide();

+    // do not show 'search' header if there are no conferences in the DB
+    if(Conference::getAll().count()==0)
+    {
+        header->hide();
+    }

 
     connect( header, SIGNAL(searchClicked()), SLOT(searchButtonClicked()));
     connect( searchAgainButton, SIGNAL(clicked()), SLOT(searchAgainClicked()));
 
     connect( header, SIGNAL(searchClicked()), SLOT(searchButtonClicked()));
     connect( searchAgainButton, SIGNAL(clicked()), SLOT(searchAgainClicked()));

diff --git a/src/gui/searchtabcontainer.h b/src/gui/searchtabcontainer.h
index bcfdc7bca40d5a4001ac7ed61db95bf734d4c02e..1eb56a42c52e7e64458c00cb5a9ffc115495ad18 100644 (file)
--- a/src/gui/searchtabcontainer.h
+++ b/src/gui/searchtabcontainer.h
@@ -14,9 +14,10 @@ public:
     virtual ~SearchTabContainer();
 protected:
     virtual void loadEvents( const QDate &aDate, const int aConferenceId );
     virtual ~SearchTabContainer();
 protected:
     virtual void loadEvents( const QDate &aDate, const int aConferenceId );

+public slots:
+    void searchAgainClicked(); // made it public - to show header when 1.st conf importing is done successfuly

 private slots:
     void searchButtonClicked();
 private slots:
     void searchButtonClicked();

-    void searchAgainClicked();

 
 private:
     SearchHead *header;
 
 private:
     SearchHead *header;

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 8f30a96519b8bf65588d7aedde6ed0dabc2c5d73..7a5da45567634943c3e2b49d39ae654874a3949a 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -31,16 +31,8 @@ TabContainer::TabContainer(QWidget *aParent)
     connect(treeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(treeView, SIGNAL(requestForConflicts(const QModelIndex &)), SLOT(displayConflicts(const QModelIndex &)));
 
     connect(treeView, SIGNAL(requestForMap(const QModelIndex &)), SLOT(displayMap(const QModelIndex &)));
     connect(treeView, SIGNAL(requestForConflicts(const QModelIndex &)), SLOT(displayConflicts(const QModelIndex &)));
 

-    if(!Conference::getAll().count()) // no conference(s) in the DB
-    {
-        dayNavigator->hide();
-    }
-    else
-    {
-        QDate aStartDate = Conference::getById(Conference::activeConference()).start();
-        QDate aEndDate = Conference::getById(Conference::activeConference()).end();
-        dayNavigator->setDates(aStartDate, aEndDate);
-    }
+    // day navigator is hidden by default
+    dayNavigator->hide();

 }
 
 void TabContainer::updateTreeView(const QDate &aDate)
 }
 
 void TabContainer::updateTreeView(const QDate &aDate)