From 35ba6eb132a2b969a53ee31e3a26d72a371e02d6 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sat, 21 Nov 2009 22:08:59 +0000 Subject: * show only a minimized set of search options per default * remember the search options when closing Dolphin, so that the user can adjust his "default search template" svn path=/trunk/KDE/kdebase/apps/; revision=1052499 --- src/dolphinmainwindow.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'src/dolphinmainwindow.cpp') diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index bec451a09..ceece9612 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1010,18 +1010,8 @@ void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& can void DolphinMainWindow::searchItems() { #ifdef HAVE_NEPOMUK - const QString searchOptions = m_searchOptionsConfigurator->options(); - - QString searchString = m_searchBox->text(); - if (!searchString.isEmpty() && !searchOptions.isEmpty()) { - searchString += ' ' + searchOptions; - } else if (!searchOptions.isEmpty()) { - searchString += searchOptions; - } - - if (!searchString.isEmpty()) { - m_activeViewContainer->setUrl(KUrl("nepomuksearch:/" + searchString)); - } + const KUrl nepomukUrl = m_searchOptionsConfigurator->nepomukUrl(); + m_activeViewContainer->setUrl(nepomukUrl); #endif } @@ -1081,7 +1071,7 @@ void DolphinMainWindow::init() #ifdef HAVE_NEPOMUK m_searchOptionsConfigurator = new DolphinSearchOptionsConfigurator(this); m_searchOptionsConfigurator->hide(); - connect(m_searchOptionsConfigurator, SIGNAL(searchOptionsChanged(QString)), + connect(m_searchOptionsConfigurator, SIGNAL(searchOptionsChanged()), this, SLOT(searchItems())); #endif @@ -1127,6 +1117,8 @@ void DolphinMainWindow::init() m_searchBox->show(); connect(m_searchBox, SIGNAL(requestSearchOptions()), this, SLOT(showSearchOptions())); + connect(m_searchBox, SIGNAL(searchTextChanged(QString)), + m_searchOptionsConfigurator, SLOT(setCustomSearchQuery(QString))); stateChanged("new_file"); -- cgit v1.3