Fix visual artefacts for tooltips, if compositing has been disabled. Thanks to Maciej...

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

diff --git a/src/search/dolphinsearchoptionsconfigurator.cpp b/src/search/dolphinsearchoptionsconfigurator.cpp
index 29df5f49d690c63865b8e5e1c85275576856474a..e51ab8c64d67ea88fb93453a8b2a629d565f842e 100644 (file)
--- a/src/search/dolphinsearchoptionsconfigurator.cpp
+++ b/src/search/dolphinsearchoptionsconfigurator.cpp
@@ -84,7 +84,7 @@ static const CriterionItem g_criterionItems[] = {
     {"Date", SearchCriterionSelector::Date},
     {"Size", SearchCriterionSelector::Size},
     {"Tag", SearchCriterionSelector::Tag},
-    {"Raging", SearchCriterionSelector::Rating}
+    {"Rating", SearchCriterionSelector::Rating}
 };
 
 DolphinSearchOptionsConfigurator::DolphinSearchOptionsConfigurator(QWidget* parent) :
@@ -107,7 +107,7 @@ DolphinSearchOptionsConfigurator::DolphinSearchOptionsConfigurator(QWidget* pare
 
     m_locationBox = new KComboBox(this);
     for (unsigned int i = 0; i < sizeof(g_locationItems) / sizeof(SettingsItem); ++i) {
-        m_locationBox->addItem(g_locationItems[i].text);
+        m_locationBox->addItem(i18nc("@label", g_locationItems[i].text));
     }
 
     // add "what" configuration
@@ -115,7 +115,7 @@ DolphinSearchOptionsConfigurator::DolphinSearchOptionsConfigurator(QWidget* pare
 
     m_whatBox = new KComboBox(this);
     for (unsigned int i = 0; i < sizeof(g_whatItems) / sizeof(SettingsItem); ++i) {
-        m_whatBox->addItem(g_whatItems[i].text);
+        m_whatBox->addItem(i18nc("@label", g_whatItems[i].text));
     }
     connect(m_whatBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateButtons()));
 
@@ -201,7 +201,14 @@ KUrl DolphinSearchOptionsConfigurator::directory() const
 KUrl DolphinSearchOptionsConfigurator::nepomukSearchUrl() const
 {
     const Nepomuk::Query::Query query = nepomukQuery();
-    return query.isValid() ? query.toSearchUrl() : KUrl();
+    if ( query.isValid() ) {
+        return query.toSearchUrl( i18nc( "@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.",
+                                         "Query Results from '%1'",
+                                         customSearchQuery() ) );
+    }
+    else {
+        return KUrl();
+    }
 }
 
 void DolphinSearchOptionsConfigurator::setCustomSearchQuery(const QString& searchQuery)
@@ -356,11 +363,14 @@ Nepomuk::Query::Query DolphinSearchOptionsConfigurator::nepomukQuery() const
     }
 
     Nepomuk::Query::FileQuery fileQuery;
+    fileQuery.setFileMode( Nepomuk::Query::FileQuery::QueryFiles );
+    fileQuery.setTerm(andTerm);
+
     if ((m_locationBox->currentIndex() == 1) && m_directory.isValid()) {
         // "From Here" is selected as location filter
         fileQuery.addIncludeFolder(m_directory);
     }
-    fileQuery.setTerm(andTerm);
+
     return fileQuery;
 }