When the search toolbox button is clicked when the search dialog is already open...

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index ce40dfaed17d7363b242e85aeb3e082e4a1e7d98..830923ac511839447eefef8614463e6618b63023 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -161,8 +161,12 @@ void MainWindow::on_nowAction_triggered() {
 
 
 void MainWindow::on_searchAction_triggered() {
 
 
 void MainWindow::on_searchAction_triggered() {

-    searchTabContainer->showSearchDialog();
-    tabWidget->setCurrentWidget(searchTab);
+    if (tabWidget->currentWidget() == searchTab)
+        searchTabContainer->showSearchDialog(!searchTabContainer->searchDialogIsVisible());
+    else {
+        tabWidget->setCurrentWidget(searchTab);
+        searchTabContainer->showSearchDialog();
+    }

 }
 
 
 }
 
 

diff --git a/src/gui/searchtabcontainer.cpp b/src/gui/searchtabcontainer.cpp
index 3abc8e5b194dc907ddb9d5375af82dd0cd16a7b2..0f4aac8475cad9e61651c997608c503377fabd39 100644 (file)
--- a/src/gui/searchtabcontainer.cpp
+++ b/src/gui/searchtabcontainer.cpp
@@ -39,6 +39,11 @@ SearchTabContainer::SearchTabContainer(QWidget *aParent) : TabContainer( aParent
 }
 
 
 }
 
 

+bool SearchTabContainer::searchDialogIsVisible() const {
+    return header->isVisible();
+}
+
+

 int SearchTabContainer::searchResultCount(const QDate& date) const {
     int confId = Conference::activeConference();
     if (confId == -1) return 0;
 int SearchTabContainer::searchResultCount(const QDate& date) const {
     int confId = Conference::activeConference();
     if (confId == -1) return 0;


@@ -46,9 +51,9 @@ int SearchTabContainer::searchResultCount(const QDate& date) const {
 }
 
 
 }
 
 

-void SearchTabContainer::showSearchDialog() {
-    header->show();
-    treeView->hide();
+void SearchTabContainer::showSearchDialog(bool show) {
+    header->setVisible(show);
+    treeView->setVisible(!show);

 }
 
 
 }
 
 

diff --git a/src/gui/searchtabcontainer.h b/src/gui/searchtabcontainer.h
index 80ecd4cf03bb4403abed4da14d1fe1888b9e1aab..3475632f616a809f8d1d0a08be8214eaed7b227d 100644 (file)
--- a/src/gui/searchtabcontainer.h
+++ b/src/gui/searchtabcontainer.h
@@ -31,6 +31,7 @@ class SearchTabContainer: public TabContainer {
 public:
     SearchTabContainer(QWidget *aParent);
     virtual ~SearchTabContainer() {}
 public:
     SearchTabContainer(QWidget *aParent);
     virtual ~SearchTabContainer() {}

+    bool searchDialogIsVisible() const;

     int searchResultCount(const QDate& date) const; ///< returns the number of events found on that specific date
 
 protected:
     int searchResultCount(const QDate& date) const; ///< returns the number of events found on that specific date
 
 protected:


@@ -40,7 +41,7 @@ signals:
     void searchResultChanged();
 
 public slots:
     void searchResultChanged();
 
 public slots:

-    void showSearchDialog();
+    void showSearchDialog(bool show=true);

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