Correct searchbox, split view transitions between tabs

[dolphin.git] / src / search / dolphinfacetswidget.cpp

diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
index 9306efdb4571fe30cb4ec91397ad4a5ba86c764f..023b30c680aa26f8817f776599137b5873417f27 100644 (file)
--- a/src/search/dolphinfacetswidget.cpp
+++ b/src/search/dolphinfacetswidget.cpp
@@ -19,7 +19,7 @@
 
 #include "dolphinfacetswidget.h"
 
 
 #include "dolphinfacetswidget.h"
 

-#include <KLocale>
+#include <KLocalizedString>

 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QDate>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QDate>


@@ -27,18 +27,6 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 

-#ifdef HAVE_NEPOMUK
-    #include <Nepomuk/Query/AndTerm>
-    #include <Nepomuk/Query/ComparisonTerm>
-    #include <Nepomuk/Query/LiteralTerm>
-    #include <Nepomuk/Query/OrTerm>
-    #include <Nepomuk/Query/Query>
-    #include <Nepomuk/Query/ResourceTypeTerm>
-    #include <Nepomuk/Vocabulary/NFO>
-    #include <Nepomuk/Vocabulary/NIE>
-    #include <Soprano/Vocabulary/NAO>
-#endif
-

 DolphinFacetsWidget::DolphinFacetsWidget(QWidget* parent) :
     QWidget(parent),
     m_documents(0),
 DolphinFacetsWidget::DolphinFacetsWidget(QWidget* parent) :
     QWidget(parent),
     m_documents(0),


@@ -58,13 +46,16 @@ DolphinFacetsWidget::DolphinFacetsWidget(QWidget* parent) :
     m_fourOrMore(0),
     m_maxRating(0)
 {
     m_fourOrMore(0),
     m_maxRating(0)
 {

-    m_documents = createCheckBox(i18nc("@option:check", "Documents"));
-    m_images    = createCheckBox(i18nc("@option:check", "Images"));
-    m_audio     = createCheckBox(i18nc("@option:check", "Audio Files"));
-    m_videos    = createCheckBox(i18nc("@option:check", "Videos"));
+    QButtonGroup* filetypeGroup = new QButtonGroup(this);
+    m_anyType   = createRadioButton(i18nc("@option:check", "Any"), filetypeGroup);
+    m_documents = createRadioButton(i18nc("@option:check", "Documents"), filetypeGroup);
+    m_images    = createRadioButton(i18nc("@option:check", "Images"), filetypeGroup);
+    m_audio     = createRadioButton(i18nc("@option:check", "Audio Files"), filetypeGroup);
+    m_videos    = createRadioButton(i18nc("@option:check", "Videos"), filetypeGroup);

 
     QVBoxLayout* typeLayout = new QVBoxLayout();
     typeLayout->setSpacing(0);
 
     QVBoxLayout* typeLayout = new QVBoxLayout();
     typeLayout->setSpacing(0);

+    typeLayout->addWidget(m_anyType);

     typeLayout->addWidget(m_documents);
     typeLayout->addWidget(m_images);
     typeLayout->addWidget(m_audio);
     typeLayout->addWidget(m_documents);
     typeLayout->addWidget(m_images);
     typeLayout->addWidget(m_audio);


@@ -112,6 +103,7 @@ DolphinFacetsWidget::DolphinFacetsWidget(QWidget* parent) :
     topLayout->addLayout(ratingLayout);
     topLayout->addStretch();
 
     topLayout->addLayout(ratingLayout);
     topLayout->addStretch();
 

+    m_anyType->setChecked(true);

     m_anytime->setChecked(true);
     m_anyRating->setChecked(true);
 }
     m_anytime->setChecked(true);
     m_anyRating->setChecked(true);
 }


@@ -120,38 +112,9 @@ DolphinFacetsWidget::~DolphinFacetsWidget()
 {
 }
 
 {
 }
 

-#ifdef HAVE_NEPOMUK
-Nepomuk::Query::Term DolphinFacetsWidget::facetsTerm() const
+QString DolphinFacetsWidget::ratingTerm() const

 {
 {

-    Nepomuk::Query::AndTerm andTerm;
-
-    const bool hasTypeFilter = m_documents->isChecked() ||
-                               m_images->isChecked() ||
-                               m_audio->isChecked() ||
-                               m_videos->isChecked();
-    if (hasTypeFilter) {
-        Nepomuk::Query::OrTerm orTerm;
-
-        if (m_documents->isChecked()) {
-            orTerm.addSubTerm(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Document()));
-        }
-
-        if (m_images->isChecked()) {
-            orTerm.addSubTerm(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Image()));
-        }
-
-        if (m_audio->isChecked()) {
-            orTerm.addSubTerm(Nepomuk::Query::ComparisonTerm(Nepomuk::Vocabulary::NIE::mimeType(),
-                                                             Nepomuk::Query::LiteralTerm("audio")));
-        }
-
-        if (m_videos->isChecked()) {
-            orTerm.addSubTerm(Nepomuk::Query::ComparisonTerm(Nepomuk::Vocabulary::NIE::mimeType(),
-                                                             Nepomuk::Query::LiteralTerm("video")));
-        }
-
-        andTerm.addSubTerm(orTerm);
-    }
+    QStringList terms;

 
     if (!m_anyRating->isChecked()) {
         int stars = 1; // represents m_oneOrMore
 
     if (!m_anyRating->isChecked()) {
         int stars = 1; // represents m_oneOrMore


@@ -166,48 +129,150 @@ Nepomuk::Query::Term DolphinFacetsWidget::facetsTerm() const
         }
 
         const int rating = stars * 2;
         }
 
         const int rating = stars * 2;

-        Nepomuk::Query::ComparisonTerm term(Soprano::Vocabulary::NAO::numericRating(),
-                                            Nepomuk::Query::LiteralTerm(rating),
-                                            Nepomuk::Query::ComparisonTerm::GreaterOrEqual);
-        andTerm.addSubTerm(term);
+        terms << QStringLiteral("rating>=%1").arg(rating);

     }
 
     if (!m_anytime->isChecked()) {
         QDate date = QDate::currentDate(); // represents m_today
         if (m_yesterday->isChecked()) {
     }
 
     if (!m_anytime->isChecked()) {
         QDate date = QDate::currentDate(); // represents m_today
         if (m_yesterday->isChecked()) {

-            date.addDays(-1);
+            date = date.addDays(-1);

         } else if (m_thisWeek->isChecked()) {
         } else if (m_thisWeek->isChecked()) {

-            date.addDays(1 - date.dayOfWeek());
+            date = date.addDays(1 - date.dayOfWeek());

         } else if (m_thisMonth->isChecked()) {
         } else if (m_thisMonth->isChecked()) {

-            date.addDays(1 - date.day());
+            date = date.addDays(1 - date.day());

         } else if (m_thisYear->isChecked()) {
         } else if (m_thisYear->isChecked()) {

-            date.addDays(1 - date.dayOfYear());
+            date = date.addDays(1 - date.dayOfYear());
+        }
+
+        terms << QStringLiteral("modified>=%1").arg(date.toString(Qt::ISODate));
+    }
+
+    return terms.join(QStringLiteral(" AND "));
+}
+
+QString DolphinFacetsWidget::facetType() const
+{
+    if (m_documents->isChecked()) {
+        return QStringLiteral("Document");
+    } else if (m_images->isChecked()) {
+        return QStringLiteral("Image");
+    } else if (m_audio->isChecked()) {
+        return QStringLiteral("Audio");
+    } else if (m_videos->isChecked()) {
+        return QStringLiteral("Video");
+    }
+
+    return QString();
+}
+
+bool DolphinFacetsWidget::isRatingTerm(const QString& term) const
+{
+    const QStringList subTerms = term.split(' ', QString::SkipEmptyParts);
+
+    // If term has sub terms, then sone of the sub terms are always "rating" and "modified" terms.
+    bool containsRating = false;
+    bool containsModified = false;
+
+    foreach (const QString& subTerm, subTerms) {
+        if (subTerm.startsWith(QLatin1String("rating>="))) {
+            containsRating = true;
+        } else if (subTerm.startsWith(QLatin1String("modified>="))) {
+            containsModified = true;

         }
         }

+    }
+
+    return containsModified || containsRating;
+}

 
 

-        Nepomuk::Query::ComparisonTerm term(Nepomuk::Vocabulary::NIE::lastModified(),
-                                            Nepomuk::Query::LiteralTerm(QDateTime(date)),
-                                            Nepomuk::Query::ComparisonTerm::GreaterOrEqual);
-        andTerm.addSubTerm(term);
+void DolphinFacetsWidget::setRatingTerm(const QString& term)
+{
+    // If term has sub terms, then the sub terms are always "rating" and "modified" terms.
+    // If term has no sub terms, then the term itself is either a "rating" term or a "modified"
+    // term. To avoid code duplication we add term to subTerms list, if the list is empty.
+    QStringList subTerms = term.split(' ', QString::SkipEmptyParts);
+
+    foreach (const QString& subTerm, subTerms) {
+        if (subTerm.startsWith(QLatin1String("modified>="))) {
+            const QString value = subTerm.mid(10);
+            const QDate date = QDate::fromString(value, Qt::ISODate);
+            setTimespan(date);
+        } else if (subTerm.startsWith(QLatin1String("rating>="))) {
+            const QString value = subTerm.mid(8);
+            const int stars = value.toInt() / 2;
+            setRating(stars);
+        }

     }
     }

+}

 
 

-    return andTerm;
+void DolphinFacetsWidget::setFacetType(const QString& type)
+{
+    if (type == QLatin1String("Document")) {
+        m_documents->setChecked(true);
+    } else if (type == QLatin1String("Image")) {
+        m_images->setChecked(true);
+    } else if (type == QLatin1String("Audio")) {
+        m_audio->setChecked(true);
+    } else if (type == QLatin1String("Video")) {
+        m_videos->setChecked(true);
+    } else {
+        m_anyType->setChecked(true);
+    }

 }
 }

-#endif

 
 

-QCheckBox* DolphinFacetsWidget::createCheckBox(const QString& text)
+void DolphinFacetsWidget::setRating(const int stars)

 {
 {

-    QCheckBox* checkBox = new QCheckBox(text);
-    connect(checkBox, SIGNAL(clicked()), this, SIGNAL(facetChanged()));
-    return checkBox;
+    switch (stars) {
+    case 5:
+        m_maxRating->setChecked(true);
+        break;
+
+    case 4:
+        m_fourOrMore->setChecked(true);
+        break;
+
+    case 3:
+        m_threeOrMore->setChecked(true);
+        break;
+
+    case 2:
+        m_twoOrMore->setChecked(true);
+        break;
+
+    case 1:
+        m_oneOrMore->setChecked(true);
+        break;
+
+    default:
+        m_anyRating->setChecked(true);
+    }
+}
+
+void DolphinFacetsWidget::setTimespan(const QDate& date)
+{
+    const QDate currentDate = QDate::currentDate();
+    const int days = date.daysTo(currentDate);
+
+    if (days <= 0) {
+        m_today->setChecked(true);
+    } else if (days <= 1) {
+        m_yesterday->setChecked(true);
+    } else if (days <= currentDate.dayOfWeek()) {
+        m_thisWeek->setChecked(true);
+    } else if (days <= currentDate.day()) {
+        m_thisMonth->setChecked(true);
+    } else if (days <= currentDate.dayOfYear()) {
+        m_thisYear->setChecked(true);
+    } else {
+        m_anytime->setChecked(true);
+    }

 }
 
 QRadioButton* DolphinFacetsWidget::createRadioButton(const QString& text,
                                                      QButtonGroup* group)
 {
     QRadioButton* button = new QRadioButton(text);
 }
 
 QRadioButton* DolphinFacetsWidget::createRadioButton(const QString& text,
                                                      QButtonGroup* group)
 {
     QRadioButton* button = new QRadioButton(text);

-    connect(button, SIGNAL(clicked()), this, SIGNAL(facetChanged()));
+    connect(button, &QRadioButton::clicked, this, &DolphinFacetsWidget::facetChanged);

     group->addButton(button);
     return button;
 }
 
     group->addButton(button);
     return button;
 }
 

-#include "dolphinfacetswidget.moc"