Fixed issue that the filterbar and the menu state have not been synchronized (a not...

svn path=/trunk/playground/utils/dolphin/; revision=631709

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 93cda320b6532b9e921fa8ab0151006b2e54ecc7..9b2286c8756953988f87f58d2a5f74b143b81db3 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -116,7 +116,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_filterBar->hide();
     connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
            this, SLOT(changeNameFilter(const QString&)));
     m_filterBar->hide();
     connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
            this, SLOT(changeNameFilter(const QString&)));

-    connect(m_filterBar, SIGNAL(closed()),
+    connect(m_filterBar, SIGNAL(closeRequest()),

             this, SLOT(closeFilterBar()));
 
     m_topLayout->addWidget(m_urlNavigator);
             this, SLOT(closeFilterBar()));
 
     m_topLayout->addWidget(m_urlNavigator);

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index 99616c29e9175570c404a660d604a484734e1868..cdb1b713bbfd99ee437c33a59ca61aebf72b24e9 100644 (file)
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -60,7 +60,7 @@ FilterBar::FilterBar(QWidget* parent) :
 
     connect(m_filterInput, SIGNAL(textChanged(const QString&)),
             this, SIGNAL(filterChanged(const QString&)));
 
     connect(m_filterInput, SIGNAL(textChanged(const QString&)),
             this, SIGNAL(filterChanged(const QString&)));

-    connect(m_close, SIGNAL(clicked()), this, SLOT(emitClose()));
+    connect(m_close, SIGNAL(clicked()), this, SLOT(emitCloseRequest()));

 }
 
 FilterBar::~FilterBar()
 }
 
 FilterBar::~FilterBar()


@@ -86,13 +86,13 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);
     if ((event->key() == Qt::Key_Escape)) {
 {
     QWidget::keyReleaseEvent(event);
     if ((event->key() == Qt::Key_Escape)) {

-        emitClose();
+        emitCloseRequest();

     }
 }
 
     }
 }
 

-void FilterBar::emitClose()
+void FilterBar::emitCloseRequest()

 {
 {

-    emit close();
+    emit closeRequest();

 }
 
 #include "filterbar.moc"
 }
 
 #include "filterbar.moc"

diff --git a/src/filterbar.h b/src/filterbar.h
index b1d60232c05c67faa27219f99fbcf2ca26d736b7..2dd02d28d4b6af7dcd2d2c65a41ee2dc31133a3d 100644 (file)
--- a/src/filterbar.h
+++ b/src/filterbar.h
@@ -51,7 +51,7 @@ signals:
     /**
      * Emitted as soon as the filterbar should get closed.
      */
     /**
      * Emitted as soon as the filterbar should get closed.
      */

-    void closed();
+    void closeRequest();

 
 protected:
     virtual void hideEvent(QHideEvent* event);
 
 protected:
     virtual void hideEvent(QHideEvent* event);


@@ -59,7 +59,7 @@ protected:
     virtual void keyReleaseEvent(QKeyEvent* event);
 
 private slots:
     virtual void keyReleaseEvent(QKeyEvent* event);
 
 private slots:

-    void emitClose();
+    void emitCloseRequest();

 
 private:
     QLabel* m_filter;
 
 private:
     QLabel* m_filter;