diff options
Diffstat (limited to 'src/search')
| -rw-r--r-- | src/search/dolphinfacetswidget.cpp | 46 | ||||
| -rw-r--r-- | src/search/dolphinfacetswidget.h | 4 | ||||
| -rw-r--r-- | src/search/dolphinsearchbox.cpp | 63 | ||||
| -rw-r--r-- | src/search/dolphinsearchbox.h | 3 | ||||
| -rw-r--r-- | src/search/dolphinsearchinformation.cpp | 4 |
5 files changed, 61 insertions, 59 deletions
diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp index 9306efdb4..de715d78f 100644 --- a/src/search/dolphinfacetswidget.cpp +++ b/src/search/dolphinfacetswidget.cpp @@ -28,14 +28,14 @@ #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 <Nepomuk2/Query/AndTerm> + #include <Nepomuk2/Query/ComparisonTerm> + #include <Nepomuk2/Query/LiteralTerm> + #include <Nepomuk2/Query/OrTerm> + #include <Nepomuk2/Query/Query> + #include <Nepomuk2/Query/ResourceTypeTerm> + #include <Nepomuk2/Vocabulary/NFO> + #include <Nepomuk2/Vocabulary/NIE> #include <Soprano/Vocabulary/NAO> #endif @@ -121,33 +121,33 @@ DolphinFacetsWidget::~DolphinFacetsWidget() } #ifdef HAVE_NEPOMUK -Nepomuk::Query::Term DolphinFacetsWidget::facetsTerm() const +Nepomuk2::Query::Term DolphinFacetsWidget::facetsTerm() const { - Nepomuk::Query::AndTerm andTerm; + Nepomuk2::Query::AndTerm andTerm; const bool hasTypeFilter = m_documents->isChecked() || m_images->isChecked() || m_audio->isChecked() || m_videos->isChecked(); if (hasTypeFilter) { - Nepomuk::Query::OrTerm orTerm; + Nepomuk2::Query::OrTerm orTerm; if (m_documents->isChecked()) { - orTerm.addSubTerm(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Document())); + orTerm.addSubTerm(Nepomuk2::Query::ResourceTypeTerm(Nepomuk2::Vocabulary::NFO::Document())); } if (m_images->isChecked()) { - orTerm.addSubTerm(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Image())); + orTerm.addSubTerm(Nepomuk2::Query::ResourceTypeTerm(Nepomuk2::Vocabulary::NFO::Image())); } if (m_audio->isChecked()) { - orTerm.addSubTerm(Nepomuk::Query::ComparisonTerm(Nepomuk::Vocabulary::NIE::mimeType(), - Nepomuk::Query::LiteralTerm("audio"))); + orTerm.addSubTerm(Nepomuk2::Query::ComparisonTerm(Nepomuk2::Vocabulary::NIE::mimeType(), + Nepomuk2::Query::LiteralTerm("audio"))); } if (m_videos->isChecked()) { - orTerm.addSubTerm(Nepomuk::Query::ComparisonTerm(Nepomuk::Vocabulary::NIE::mimeType(), - Nepomuk::Query::LiteralTerm("video"))); + orTerm.addSubTerm(Nepomuk2::Query::ComparisonTerm(Nepomuk2::Vocabulary::NIE::mimeType(), + Nepomuk2::Query::LiteralTerm("video"))); } andTerm.addSubTerm(orTerm); @@ -166,9 +166,9 @@ Nepomuk::Query::Term DolphinFacetsWidget::facetsTerm() const } const int rating = stars * 2; - Nepomuk::Query::ComparisonTerm term(Soprano::Vocabulary::NAO::numericRating(), - Nepomuk::Query::LiteralTerm(rating), - Nepomuk::Query::ComparisonTerm::GreaterOrEqual); + Nepomuk2::Query::ComparisonTerm term(Soprano::Vocabulary::NAO::numericRating(), + Nepomuk2::Query::LiteralTerm(rating), + Nepomuk2::Query::ComparisonTerm::GreaterOrEqual); andTerm.addSubTerm(term); } @@ -184,9 +184,9 @@ Nepomuk::Query::Term DolphinFacetsWidget::facetsTerm() const date.addDays(1 - date.dayOfYear()); } - Nepomuk::Query::ComparisonTerm term(Nepomuk::Vocabulary::NIE::lastModified(), - Nepomuk::Query::LiteralTerm(QDateTime(date)), - Nepomuk::Query::ComparisonTerm::GreaterOrEqual); + Nepomuk2::Query::ComparisonTerm term(Nepomuk2::Vocabulary::NIE::lastModified(), + Nepomuk2::Query::LiteralTerm(QDateTime(date)), + Nepomuk2::Query::ComparisonTerm::GreaterOrEqual); andTerm.addSubTerm(term); } diff --git a/src/search/dolphinfacetswidget.h b/src/search/dolphinfacetswidget.h index 65734aa66..57bed9e68 100644 --- a/src/search/dolphinfacetswidget.h +++ b/src/search/dolphinfacetswidget.h @@ -24,7 +24,7 @@ #include <config-nepomuk.h> #ifdef HAVE_NEPOMUK - #include <Nepomuk/Query/Term> + #include <Nepomuk2/Query/Term> #endif class QButtonGroup; @@ -56,7 +56,7 @@ public: virtual ~DolphinFacetsWidget(); #ifdef HAVE_NEPOMUK - Nepomuk::Query::Term facetsTerm() const; + Nepomuk2::Query::Term facetsTerm() const; #endif signals: diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index 28f1f1af5..8b660712a 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -42,16 +42,16 @@ #include <config-nepomuk.h> #ifdef HAVE_NEPOMUK - #include <Nepomuk/Query/AndTerm> - #include <Nepomuk/Query/FileQuery> - #include <Nepomuk/Query/LiteralTerm> - #include <Nepomuk/Query/OrTerm> - #include <Nepomuk/Query/Query> - #include <Nepomuk/Query/QueryParser> - #include <Nepomuk/Query/ResourceTypeTerm> - #include <Nepomuk/Query/ComparisonTerm> - #include <Nepomuk/ResourceManager> - #include <Nepomuk/Vocabulary/NFO> + #include <Nepomuk2/Query/AndTerm> + #include <Nepomuk2/Query/FileQuery> + #include <Nepomuk2/Query/LiteralTerm> + #include <Nepomuk2/Query/OrTerm> + #include <Nepomuk2/Query/Query> + #include <Nepomuk2/Query/QueryParser> + #include <Nepomuk2/Query/ResourceTypeTerm> + #include <Nepomuk2/Query/ComparisonTerm> + #include <Nepomuk2/ResourceManager> + #include <Nepomuk2/Vocabulary/NFO> #endif DolphinSearchBox::DolphinSearchBox(QWidget* parent) : @@ -239,10 +239,9 @@ void DolphinSearchBox::slotReturnPressed(const QString& text) void DolphinSearchBox::slotFacetsButtonToggled() { - const bool visible = !m_facetsWidget->isVisible(); - m_facetsWidget->setVisible(visible); - SearchSettings::setShowFacetsWidget(visible); - updateFacetsToggleButtonIcon(); + const bool facetsIsVisible = !m_facetsWidget->isVisible(); + m_facetsWidget->setVisible(facetsIsVisible); + updateFacetsToggleButton(); } void DolphinSearchBox::slotFacetChanged() @@ -281,6 +280,7 @@ void DolphinSearchBox::saveSettings() { SearchSettings::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere"); SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content"); + SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked()); SearchSettings::self()->writeConfig(); } @@ -343,7 +343,8 @@ void DolphinSearchBox::init() // Create "Facets" widgets m_facetsToggleButton = new QToolButton(this); - m_facetsToggleButton->setAutoRaise(true); + m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + initButton(m_facetsToggleButton); connect(m_facetsToggleButton, SIGNAL(clicked()), this, SLOT(slotFacetsButtonToggled())); m_facetsWidget = new DolphinFacetsWidget(this); @@ -390,7 +391,7 @@ void DolphinSearchBox::init() m_startSearchTimer->setInterval(1000); connect(m_startSearchTimer, SIGNAL(timeout()), this, SLOT(emitSearchRequest())); - updateFacetsToggleButtonIcon(); + updateFacetsToggleButton(); applyReadOnlyState(); } @@ -401,30 +402,30 @@ KUrl DolphinSearchBox::nepomukUrlForSearching() const // dependent on whether a searching for content or // filename is done const QString text = m_searchInput->text(); - Nepomuk::Query::Term searchLabelTerm; + Nepomuk2::Query::Term searchLabelTerm; if (m_contentButton->isChecked()) { // Let Nepomuk parse the query - searchLabelTerm = Nepomuk::Query::QueryParser::parseQuery(text, Nepomuk::Query::QueryParser::DetectFilenamePattern).term(); + searchLabelTerm = Nepomuk2::Query::QueryParser::parseQuery(text, Nepomuk2::Query::QueryParser::DetectFilenamePattern).term(); } else { // Search the text in the filename only QString regex = QRegExp::escape(text); regex.replace("\\*", QLatin1String(".*")); regex.replace("\\?", QLatin1String(".")); regex.replace("\\", "\\\\"); - searchLabelTerm = Nepomuk::Query::ComparisonTerm( - Nepomuk::Vocabulary::NFO::fileName(), - Nepomuk::Query::LiteralTerm(regex), - Nepomuk::Query::ComparisonTerm::Regexp); + searchLabelTerm = Nepomuk2::Query::ComparisonTerm( + Nepomuk2::Vocabulary::NFO::fileName(), + Nepomuk2::Query::LiteralTerm(regex), + Nepomuk2::Query::ComparisonTerm::Regexp); } // Get the term from the facets and merge it with the // created term from the input-field. - Nepomuk::Query::Term facetsTerm = m_facetsWidget->facetsTerm(); + Nepomuk2::Query::Term facetsTerm = m_facetsWidget->facetsTerm(); - Nepomuk::Query::FileQuery fileQuery; - fileQuery.setFileMode(Nepomuk::Query::FileQuery::QueryFilesAndFolders); + Nepomuk2::Query::FileQuery fileQuery; + fileQuery.setFileMode(Nepomuk2::Query::FileQuery::QueryFilesAndFolders); if (facetsTerm.isValid()) { - Nepomuk::Query::AndTerm andTerm; + Nepomuk2::Query::AndTerm andTerm; andTerm.addSubTerm(searchLabelTerm); andTerm.addSubTerm(facetsTerm); fileQuery.setTerm(andTerm); @@ -449,7 +450,7 @@ void DolphinSearchBox::applyReadOnlyState() { #ifdef HAVE_NEPOMUK if (m_readOnly) { - m_searchLabel->setText(Nepomuk::Query::Query::titleFromQueryUrl(m_readOnlyQuery)); + m_searchLabel->setText(Nepomuk2::Query::Query::titleFromQueryUrl(m_readOnlyQuery)); } else { #else { @@ -467,10 +468,12 @@ void DolphinSearchBox::applyReadOnlyState() } } -void DolphinSearchBox::updateFacetsToggleButtonIcon() +void DolphinSearchBox::updateFacetsToggleButton() { - const bool visible = SearchSettings::showFacetsWidget(); - m_facetsToggleButton->setIcon(KIcon(visible ? "list-remove" : "list-add")); + const bool facetsIsVisible = SearchSettings::showFacetsWidget(); + m_facetsToggleButton->setChecked(facetsIsVisible ? true : false); + m_facetsToggleButton->setIcon(KIcon(facetsIsVisible ? "arrow-up-double" : "arrow-down-double")); + m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Less Options") : i18nc("action:button", "More Options")); } #include "dolphinsearchbox.moc" diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h index ee9987a38..f3cc535d6 100644 --- a/src/search/dolphinsearchbox.h +++ b/src/search/dolphinsearchbox.h @@ -133,8 +133,7 @@ private: void applyReadOnlyState(); - void updateFacetsToggleButtonIcon(); - + void updateFacetsToggleButton(); private: bool m_startedSearching; bool m_readOnly; diff --git a/src/search/dolphinsearchinformation.cpp b/src/search/dolphinsearchinformation.cpp index 8af951a7b..7fa5f7ba8 100644 --- a/src/search/dolphinsearchinformation.cpp +++ b/src/search/dolphinsearchinformation.cpp @@ -23,7 +23,7 @@ #ifdef HAVE_NEPOMUK #include <KConfig> #include <KConfigGroup> - #include <Nepomuk/ResourceManager> + #include <Nepomuk2/ResourceManager> #endif #include <KGlobal> @@ -90,7 +90,7 @@ DolphinSearchInformation::DolphinSearchInformation() : m_indexingEnabled(false) { #ifdef HAVE_NEPOMUK - if (Nepomuk::ResourceManager::instance()->initialized()) { + if (Nepomuk2::ResourceManager::instance()->initialized()) { KConfig config("nepomukserverrc"); m_indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false); } |