X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/232e7eaad76cc027341a6d927ebb905312c4ff4c..4f24794fc32cd94dfbd473fa8dbc4b504c20bcb3:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 5c89b77e0..a83a95fc1 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -24,11 +24,13 @@ #include "dolphinremoteencoding.h" #include +#ifdef HAVE_NEPOMUK + #include "search/dolphinsearchoptionsconfigurator.h" +#endif #include "dolphinapplication.h" #include "dolphinnewmenu.h" #include "search/dolphinsearchbox.h" -#include "search/dolphinsearchoptionsconfigurator.h" #include "settings/dolphinsettings.h" #include "settings/dolphinsettingsdialog.h" #include "dolphinviewcontainer.h" @@ -1012,9 +1014,11 @@ void DolphinMainWindow::slotTabMoved(int from, int to) m_tabIndex = m_tabBar->currentIndex(); } -void DolphinMainWindow::slotSearchBoxTextChanged(const QString& text) +void DolphinMainWindow::showSearchOptions() { - m_searchOptionsConfigurator->setVisible(!text.isEmpty()); +#ifdef HAVE_NEPOMUK + m_searchOptionsConfigurator->show(); +#endif } void DolphinMainWindow::init() @@ -1057,8 +1061,10 @@ void DolphinMainWindow::init() connect(this, SIGNAL(urlChanged(const KUrl&)), m_remoteEncoding, SLOT(slotAboutToOpenUrl())); +#ifdef HAVE_NEPOMUK m_searchOptionsConfigurator = new DolphinSearchOptionsConfigurator(this); m_searchOptionsConfigurator->hide(); +#endif m_tabBar = new KTabBar(this); m_tabBar->setMovable(true); @@ -1086,7 +1092,9 @@ void DolphinMainWindow::init() m_centralWidgetLayout = new QVBoxLayout(centralWidget); m_centralWidgetLayout->setSpacing(0); m_centralWidgetLayout->setMargin(0); +#ifdef HAVE_NEPOMUK m_centralWidgetLayout->addWidget(m_searchOptionsConfigurator); +#endif m_centralWidgetLayout->addWidget(m_tabBar); m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1); @@ -1098,8 +1106,8 @@ void DolphinMainWindow::init() m_searchBox->setParent(toolBar("searchToolBar")); m_searchBox->show(); - connect(m_searchBox, SIGNAL(textChanged(const QString&)), - this, SLOT(slotSearchBoxTextChanged(const QString&))); + connect(m_searchBox, SIGNAL(requestSearchOptions()), + this, SLOT(showSearchOptions())); stateChanged("new_file");