Merge remote-tracking branch 'origin/KDE/4.10'

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 8b660712a1abff9545499a6164892d62e734f41e..ef9c2bfcf627b7712f6dbc6e1136fe9bf0160171 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -159,7 +159,7 @@ void DolphinSearchBox::selectAll()
 
 void DolphinSearchBox::setReadOnly(bool readOnly, const KUrl& query)
 {
-    if (m_readOnly != readOnly) {
+    if (m_readOnly != readOnly || m_readOnlyQuery != query) {
         m_readOnly = readOnly;
         m_readOnlyQuery = query;
         applyReadOnlyState();
@@ -473,7 +473,7 @@ void DolphinSearchBox::updateFacetsToggleButton()
     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"));
+    m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options"));
 }
 
 #include "dolphinsearchbox.moc"