Make the button that enables additional search options more obvious

This is achieved by adding some descriptive text and by using a more
appropriate icon.

Thanks to Panos Kanavos for the patch!

BUG: 300248
FIXED-IN: 4.10.0
REVIEW: 106325

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 28f1f1af56329f4b8c3cd872b90d660d0c2a4801..a9a4b667aa999c31acd58ae4783f35820efa2415 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -239,10 +239,9 @@ void DolphinSearchBox::slotReturnPressed(const QString& text)
 
 void DolphinSearchBox::slotFacetsButtonToggled()
 {
 
 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()
 }
 
 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::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere");
     SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content");

+    SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked() ? true : false);

     SearchSettings::self()->writeConfig();
 }
 
     SearchSettings::self()->writeConfig();
 }
 


@@ -343,7 +343,8 @@ void DolphinSearchBox::init()
 
     // Create "Facets" widgets
     m_facetsToggleButton = new QToolButton(this);
 
     // 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);
     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()));
 
     m_startSearchTimer->setInterval(1000);
     connect(m_startSearchTimer, SIGNAL(timeout()), this, SLOT(emitSearchRequest()));
 

-    updateFacetsToggleButtonIcon();
+    updateFacetsToggleButton();

     applyReadOnlyState();
 }
 
     applyReadOnlyState();
 }
 


@@ -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"
 }
 
 #include "dolphinsearchbox.moc"

diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h
index ee9987a3899896e9d53301c74f8afa32c4b63abe..f3cc535d60f813016f3159b492874ddb3a8ea9ca 100644 (file)
--- a/src/search/dolphinsearchbox.h
+++ b/src/search/dolphinsearchbox.h
@@ -133,8 +133,7 @@ private:
 
     void applyReadOnlyState();
 
 
     void applyReadOnlyState();
 

-    void updateFacetsToggleButtonIcon();
-
+    void updateFacetsToggleButton();

 private:
     bool m_startedSearching;
     bool m_readOnly;
 private:
     bool m_startedSearching;
     bool m_readOnly;