Rename FacetPanel to FilterPanel so that the name reflects the headline.

svn path=/trunk/KDE/kdebase/apps/; revision=1190370

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e435cfb446eec8f470eedbefc496703a237b3626..1fe94261c0a24ff70cf20b3dc4d74c5664ded2c7 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -148,7 +148,7 @@ kde4_add_kcfg_files(dolphin_SRCS
 if(Nepomuk_FOUND)
     set(dolphin_SRCS
         ${dolphin_SRCS}
-        panels/facets/facetpanel.cpp
+        panels/filter/filterpanel.cpp
         search/filters/abstractsearchfilterwidget.cpp
         search/filters/datesearchfilterwidget.cpp
         search/filters/ratingsearchfilterwidget.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index efae23d6e092e69fe96ba65be8edbdf305c41e9b..167debd336f5e478c75703f3ad6824ff147be18a 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -28,7 +28,7 @@
 #include "dolphinnewfilemenu.h"
 #include "dolphinviewcontainer.h"
 #include "mainwindowadaptor.h"
-#include "panels/facets/facetpanel.h"
+#include "panels/filter/filterpanel.h"
 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
 #include "panels/information/informationpanel.h"
@@ -1563,20 +1563,20 @@ void DolphinMainWindow::setupDockWidgets()
     connect(foldersPanel, SIGNAL(changeUrl(KUrl, Qt::MouseButtons)),
             this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
 
-    // setup "Facets"
+    // setup "Filter"
 #ifdef HAVE_NEPOMUK
-   QDockWidget* facetDock = new QDockWidget(i18nc("@title:window", "Filter"));
-   facetDock->setObjectName("facetDock");
-   facetDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-   Panel* facetPanel = new FacetPanel(facetDock);
-   connect(facetPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
-   facetDock->setWidget(facetPanel);
-
-   QAction* facetAction = facetDock->toggleViewAction();
-   facetAction->setIcon(KIcon("dialog-facet"));
-   addDockWidget(Qt::RightDockWidgetArea, facetDock);
+   QDockWidget* filterDock = new QDockWidget(i18nc("@title:window", "Filter"));
+   filterDock->setObjectName("filterDock");
+   filterDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+   Panel* filterPanel = new FilterPanel(filterDock);
+   connect(filterPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
+   filterDock->setWidget(filterPanel);
+
+   QAction* filterAction = filterDock->toggleViewAction();
+   filterAction->setIcon(KIcon("dialog-facet"));
+   addDockWidget(Qt::RightDockWidgetArea, filterDock);
    connect(this, SIGNAL(urlChanged(KUrl)),
-           facetPanel, SLOT(setUrl(KUrl)));
+           filterPanel, SLOT(setUrl(KUrl)));
 #endif
 
     // setup "Terminal"
@@ -1634,7 +1634,7 @@ void DolphinMainWindow::setupDockWidgets()
     panelsMenu->addAction(infoAction);
     panelsMenu->addAction(foldersAction);
 #ifdef HAVE_NEPOMUK
-    panelsMenu->addAction(facetAction);
+    panelsMenu->addAction(filterAction);
 #endif
 #ifndef Q_OS_WIN
     panelsMenu->addAction(terminalAction);

diff --git a/src/panels/facets/facetpanel.cpp b/src/panels/filter/filterpanel.cpp
similarity index 92%
rename from src/panels/facets/facetpanel.cpp
rename to src/panels/filter/filterpanel.cpp
index 3c930209cb5fe610b859ad692bb714f3f3f0e3d4..4410a54567c3a0d1eecab9a9f882a2bddd86bec4 100644 (file)
--- a/src/panels/facets/facetpanel.cpp
+++ b/src/panels/filter/filterpanel.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "facetpanel.h"
+#include "filterpanel.h"
 
 #include <nepomuk/filequery.h>
 #include <nepomuk/facetwidget.h>
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 
 
-FacetPanel::FacetPanel(QWidget* parent)
+FilterPanel::FilterPanel(QWidget* parent)
     : Panel(parent)
 {
     QVBoxLayout* layout = new QVBoxLayout(this);
@@ -52,11 +52,11 @@ FacetPanel::FacetPanel(QWidget* parent)
 }
 
 
-FacetPanel::~FacetPanel()
+FilterPanel::~FilterPanel()
 {
 }
 
-void FacetPanel::setUrl(const KUrl& url)
+void FilterPanel::setUrl(const KUrl& url)
 {
     kDebug() << url;
     Panel::setUrl(url);
@@ -71,7 +71,7 @@ void FacetPanel::setUrl(const KUrl& url)
 }
 
 
-void FacetPanel::setQuery(const Nepomuk::Query::Query& query)
+void FilterPanel::setQuery(const Nepomuk::Query::Query& query)
 {
     kDebug() << query << query.isValid() << query.toSparqlQuery();
 
@@ -90,7 +90,7 @@ void FacetPanel::setQuery(const Nepomuk::Query::Query& query)
 }
 
 
-void FacetPanel::slotSetUrlStatFinished(KJob* job)
+void FilterPanel::slotSetUrlStatFinished(KJob* job)
 {
     m_lastSetUrlStatJob = 0;
     kDebug() << url();
@@ -110,7 +110,7 @@ void FacetPanel::slotSetUrlStatFinished(KJob* job)
 }
 
 
-void FacetPanel::slotFacetsChanged()
+void FilterPanel::slotFacetsChanged()
 {
     Nepomuk::Query::Query query( m_unfacetedRestQuery && m_facetWidget->queryTerm() );
     kDebug() << query;
@@ -118,7 +118,7 @@ void FacetPanel::slotFacetsChanged()
 }
 
 
-void FacetPanel::slotRemoveFolderRestrictionClicked()
+void FilterPanel::slotRemoveFolderRestrictionClicked()
 {
     Nepomuk::Query::FileQuery query( m_unfacetedRestQuery && m_facetWidget->queryTerm() );
     query.setIncludeFolders( KUrl::List() );

diff --git a/src/panels/facets/facetpanel.h b/src/panels/filter/filterpanel.h
similarity index 92%
rename from src/panels/facets/facetpanel.h
rename to src/panels/filter/filterpanel.h
index 6673c79531534fa8f713154c17a230d734ea5b2e..d42c2f0bd2520c95ef87831bbbb9b89a78b55579 100644 (file)
--- a/src/panels/facets/facetpanel.h
+++ b/src/panels/filter/filterpanel.h
@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#ifndef FACETPANEL_H
-#define FACETPANEL_H
+#ifndef FILTERPANEL_H
+#define FILTERPANEL_H
 
 #include "../panel.h"
 #include <nepomuk/query.h>
@@ -32,13 +32,13 @@ namespace Nepomuk {
     }
 }
 
-class FacetPanel : public Panel
+class FilterPanel : public Panel
 {
     Q_OBJECT
 
 public:
-    FacetPanel(QWidget* parent = 0);
-    ~FacetPanel();
+    FilterPanel(QWidget* parent = 0);
+    ~FilterPanel();
 
 public slots:
     void setUrl(const KUrl& url);
@@ -64,4 +64,4 @@ private:
     Nepomuk::Query::Query m_unfacetedRestQuery;
 };
 
-#endif // FACETPANEL_H
+#endif // FILTERPANEL_H